Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsrinivasan2006-06-05 17:31:12 +0000
committerrsrinivasan2006-06-05 17:31:12 +0000
commite534950d0b9ebbb15a852d09587baa17dd1cb012 (patch)
tree1105a627a66578816157fb5f917a25a47f8ada8a
parent40b3e0475cf266132c14093690bd87ba88e2dd06 (diff)
downloadwebtools.jsf-20060605.tar.gz
webtools.jsf-20060605.tar.xz
webtools.jsf-20060605.zip
This commit was manufactured by cvs2svn to create tag 'v20060605'.v20060605
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/.classpath7
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/.cvsignore3
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/.project28
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF11
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/about.html22
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/about.ini29
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/about.mappings6
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/about.properties24
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/build.properties21
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/eclipse32.gifbin1706 -> 0 bytes
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/eclipse32.pngbin4594 -> 0 bytes
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/plugin.properties2
-rw-r--r--assembly/plugins/org.eclipse.jsf.branding/src/org/eclipse/jsf/main/MainPlugin.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/.cvsignore4
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs14
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF40
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/build.properties17
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore86
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.genmodel50
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/model/templates/Header.javajetinc10
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties13
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml73
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/schema/grammar-annotations.xsd43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/schema/jsfLibraries.exsd160
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java260
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/J2EEModuleDependencyDelegate.java321
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModelAdapter.java164
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigPersistData.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryDecorator.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java212
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java233
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java180
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java84
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java554
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java64
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java670
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java560
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java155
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java419
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java480
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java276
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java182
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java205
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java121
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties39
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java254
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java243
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java340
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigLocater.java170
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigProvider.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ArtifactEditJSFAppConfigProvider.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java243
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/DefaultJSFAppConfigLocater.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IFacesConfigChangeListener.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigLocater.java58
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvider.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvidersChangeListener.java29
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java167
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java172
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigManager.java723
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigProvidersChangeEvent.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigUtils.java270
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java119
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java70
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/InvalidArchiveFilesCreationException.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java141
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/BooleanLiteralType.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeType.java172
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeTypeCoercer.java126
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/FloatLiteralType.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IAssignable.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IntegerLiteralType.java73
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/LiteralType.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/MethodType.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NullLiteralType.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NumericTypeLiteral.java84
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/SignatureBasedType.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/StringLiteralType.java133
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercer.java131
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercionException.java58
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeComparator.java186
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeConstants.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeTransformer.java213
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeUtil.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/ValueType.java173
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs6
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF51
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties8
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml70
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gifbin1562 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gifbin2683 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gifbin2778 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gifbin981 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gifbin990 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gifbin879 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gifbin895 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gifbin899 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gifbin916 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gifbin1022 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gifbin1022 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gifbin150 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gifbin321 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gifbin324 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gifbin211 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gifbin601 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gifbin735 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gifbin167 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gifbin133 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gifbin1225 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gifbin571 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gifbin718 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gifbin559 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gifbin322 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gifbin5600 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gifbin259 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gifbin2701 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties44
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml83
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java663
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties481
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java278
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties75
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java1082
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java9
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java706
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java167
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java238
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java208
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java496
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java230
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java243
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java262
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java232
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java70
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java385
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java420
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java208
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java182
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java108
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java283
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java385
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java131
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java739
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java230
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java68
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java183
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java377
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java122
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java1196
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java240
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java542
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java177
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties133
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java212
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java330
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java122
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java120
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java85
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java140
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java255
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java262
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java186
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java124
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java179
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java187
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java98
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java98
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java20
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java84
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java131
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java369
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java347
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java251
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java474
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java469
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java163
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java96
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java311
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java392
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java552
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java291
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java78
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java310
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java230
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java1161
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java117
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java269
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java392
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java607
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java123
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java472
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java550
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java878
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java388
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java773
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java531
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java158
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java78
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java379
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java144
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java394
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java472
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java186
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java82
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties12
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java238
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java122
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java156
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java164
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java271
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java939
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java219
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java104
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java224
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java201
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java179
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java261
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java168
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java281
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java250
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java163
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java285
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java924
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java24
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java507
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java685
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java390
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java337
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java81
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties35
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java170
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java464
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java186
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java216
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java569
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java23
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java124
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java145
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java285
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java133
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java217
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java513
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java411
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java480
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java318
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java456
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java172
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java60
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java375
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java157
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java640
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java380
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java323
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java326
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java580
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java696
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java299
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java107
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java126
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java109
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java381
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java350
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java506
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java538
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java407
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java408
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java771
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java536
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java175
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java318
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java309
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java217
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties118
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/.cvsignore4
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/build.properties17
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/icons/full/wizban/addlibrary_wiz.gifbin3148 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_l_obj.gifbin581 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_obj.gifbin587 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/library_obj.gifbin338 -> 0 bytes
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties14
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml55
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/JSFUiPlugin.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/Messages.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java384
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java311
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java480
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/IJSFImplLibraryCreationListener.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java720
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryPropertyPage.java193
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/messages.properties80
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/project/facet/JSFFacetInstallPage.java473
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/ELPrefPanel.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/JSFValidationPreferencePage.java84
408 files changed, 0 insertions, 71042 deletions
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.classpath b/assembly/plugins/org.eclipse.jsf.branding/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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>
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore b/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
deleted file mode 100644
index 3bc67e449..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-@dot*
-temp.folder
-build.xml
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.project b/assembly/plugins/org.eclipse.jsf.branding/.project
deleted file mode 100644
index bd5000449..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf.branding</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF b/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
deleted file mode 100644
index b24d7e834..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.Name
-Bundle-SymbolicName: org.eclipse.jsf
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.jsf.main.MainPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Eclipse-AutoStart: true
-Bundle-Vendor: %plugin.Provider
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.html b/assembly/plugins/org.eclipse.jsf.branding/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html> \ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.ini b/assembly/plugins/org.eclipse.jsf.branding/about.ini
deleted file mode 100644
index a21a3ecea..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.mappings b/assembly/plugins/org.eclipse.jsf.branding/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@ \ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.properties b/assembly/plugins/org.eclipse.jsf.branding/about.properties
deleted file mode 100644
index c62b076f8..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=JavaServer Faces Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/assembly/plugins/org.eclipse.jsf.branding/build.properties b/assembly/plugins/org.eclipse.jsf.branding/build.properties
deleted file mode 100644
index bbae2447b..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- eclipse32.png,\
- eclipse32.gif,\
- about.properties,\
- about.mappings,\
- about.ini,\
- about.html,\
- plugin.properties,\
- bin/
-src.includes = src/,\
- eclipse32.png,\
- eclipse32.gif,\
- build.properties,\
- about.properties,\
- about.mappings,\
- about.ini,\
- about.html,\
- META-INF/,\
- plugin.properties
diff --git a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif b/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png b/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png
deleted file mode 100644
index 568fac1d0..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties b/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
deleted file mode 100644
index fe471d244..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin.Name=JavaServer Faces Tools
-plugin.Provider=Eclipse.org \ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/src/org/eclipse/jsf/main/MainPlugin.java b/assembly/plugins/org.eclipse.jsf.branding/src/org/eclipse/jsf/main/MainPlugin.java
deleted file mode 100644
index a8b13fe75..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/src/org/eclipse/jsf/main/MainPlugin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jsf.main;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class MainPlugin extends AbstractUIPlugin {
-
- //The shared instance.
- private static MainPlugin plugin;
-
- /**
- * The constructor.
- */
- public MainPlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static MainPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.jsf.main", path);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/.classpath b/jsf/plugins/org.eclipse.jst.jsf.core/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.core/.cvsignore
deleted file mode 100644
index 7033a799b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot*
-temp.folder
-build.xml
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/.project b/jsf/plugins/org.eclipse.jst.jsf.core/.project
deleted file mode 100644
index 0cd3e2750..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b657f3789..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Tue May 02 10:28:12 PDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 91302a143..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.core; singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.core.internal.JSFCorePlugin
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.server.core,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.jst.j2ee,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jem.util,
- org.eclipse.wst.xml.core,
- org.eclipse.jst.jsf.facesconfig,
- org.eclipse.wst.common.emf,
- org.eclipse.jem.workbench,
- org.eclipse.wst.common.frameworks.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.ui",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.launch,
- org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig,
- org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry,
- org.eclipse.jst.jsf.core.internal.types
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/build.properties b/jsf/plugins/org.eclipse.jst.jsf.core/build.properties
deleted file mode 100644
index 6361a84e1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- schema/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore b/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore
deleted file mode 100644
index c4ed2681d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="jsflibraryregistry"
- nsURI="http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd" nsPrefix="jsflibreg">
- <eClassifiers xsi:type="ecore:EClass" name="JSFLibraryRegistry">
- <eOperations name="getJSFLibraryByID" lowerBound="1" eType="#//JSFLibrary">
- <eParameters name="ID" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getJSFLibrariesByName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">
- <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getImplJSFLibraries" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList"/>
- <eOperations name="getNonImplJSFLibraries" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList"/>
- <eOperations name="getAllJSFLibraries" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList"/>
- <eOperations name="addJSFLibrary" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="library" lowerBound="1" eType="#//JSFLibrary"/>
- </eOperations>
- <eOperations name="removeJSFLibrary" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="library" lowerBound="1" eType="#//JSFLibrary"/>
- </eOperations>
- <eOperations name="getDefaultImplementation" lowerBound="1" eType="#//JSFLibrary"/>
- <eOperations name="setDefaultImplementation" lowerBound="1">
- <eParameters name="implementation" lowerBound="1" eType="#//JSFLibrary"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="DefaultImplementationID"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral=""/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="JSFLibraries" upperBound="-1"
- eType="#//JSFLibrary" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="PluginProvidedJSFLibraries"
- upperBound="-1" eType="#//PluginProvidedJSFLibrary" transient="true" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JSFLibrary">
- <eOperations name="containsArchiveFile" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="fullPath" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getWorkingCopy" lowerBound="1" eType="#//JSFLibrary"/>
- <eOperations name="updateValues" lowerBound="1">
- <eParameters name="otherLibrary" lowerBound="1" eType="#//JSFLibrary"/>
- </eOperations>
- <eOperations name="copyTo" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="baseDestLocation" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="ID" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="" iD="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="Name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="JSFVersion" lowerBound="1"
- eType="#//JSFVersion" defaultValueLiteral="UNKNOWN"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="Deployed" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="Implementation" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="ArchiveFiles" upperBound="-1"
- eType="#//ArchiveFile" containment="true" eOpposite="#//ArchiveFile/JSFLibrary"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PluginProvidedJSFLibrary" eSuperTypes="#//JSFLibrary">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="pluginID" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ArchiveFile">
- <eOperations name="getName" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eOperations name="getPath" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eOperations name="exists" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eOperations name="equals" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="object" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- </eOperations>
- <eOperations name="hashCode" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eOperations name="copyTo" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="baseDestLocation" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getResolvedSourceLocation" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="RelativeToWorkspace" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="SourceLocation" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="RelativeDestLocation" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="JSFLibrary" lowerBound="1"
- eType="#//JSFLibrary" eOpposite="#//JSFLibrary/ArchiveFiles"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="JSFVersion">
- <eLiterals name="UNKNOWN" value="-1"/>
- <eLiterals name="v1_1" value="1"/>
- <eLiterals name="v1_2" value="2"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.genmodel b/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.genmodel
deleted file mode 100644
index 0bde041a4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.genmodel
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2005 Oracle Corporation"
- modelDirectory="/org.eclipse.jst.jsf.core/src" editDirectory="/org.eclipse.jst.jsf.core.edit/src"
- editorDirectory="/org.eclipse.jst.jsf.core.editor/src" modelPluginID="org.eclipse.jst.jsf.core"
- templateDirectory="templates" dynamicTemplates="true" modelName="JSFLibraryRegistry"
- importerID="org.eclipse.emf.importer.ecore">
- <foreignModel>jsflibraryregistry.ecore</foreignModel>
- <genPackages prefix="JSFLibraryRegistry" basePackage="org.eclipse.jst.jsf.core.internal"
- resource="XML" disposableProviderFactory="true" ecorePackage="jsflibraryregistry.ecore#/">
- <genEnums ecoreEnum="jsflibraryregistry.ecore#//JSFVersion">
- <genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v1_1"/>
- <genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v1_2"/>
- <genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/UNKNOWN"/>
- </genEnums>
- <genClasses ecoreClass="jsflibraryregistry.ecore#//JSFLibraryRegistry">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jsflibraryregistry.ecore#//JSFLibraryRegistry/JSFLibraries"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference jsflibraryregistry.ecore#//JSFLibraryRegistry/DefaultImplementation"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//JSFLibraryRegistry/getJSFLibrary">
- <genParameters ecoreParameter="jsflibraryregistry.ecore#//JSFLibraryRegistry/getJSFLibrary/name"/>
- </genOperations>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//JSFLibraryRegistry/getImplJSFLibraries"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//JSFLibraryRegistry/getNonImplJSFLibraries"/>
- </genClasses>
- <genClasses ecoreClass="jsflibraryregistry.ecore#//JSFLibrary">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsflibraryregistry.ecore#//JSFLibrary/Name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsflibraryregistry.ecore#//JSFLibrary/JSFVersion"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsflibraryregistry.ecore#//JSFLibrary/Deployed"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsflibraryregistry.ecore#//JSFLibrary/Implementation"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference jsflibraryregistry.ecore#//JSFLibrary/ArchiveFiles"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference jsflibraryregistry.ecore#//JSFLibrary/JSFLibraryRegistry"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//JSFLibrary/equals">
- <genParameters ecoreParameter="jsflibraryregistry.ecore#//JSFLibrary/equals/object"/>
- </genOperations>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//JSFLibrary/hashCode"/>
- </genClasses>
- <genClasses ecoreClass="jsflibraryregistry.ecore#//ArchiveFile">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsflibraryregistry.ecore#//ArchiveFile/FullPath"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference jsflibraryregistry.ecore#//ArchiveFile/JSFLibrary"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//ArchiveFile/getName"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//ArchiveFile/getPath"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//ArchiveFile/exists"/>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//ArchiveFile/equals">
- <genParameters ecoreParameter="jsflibraryregistry.ecore#//ArchiveFile/equals/object"/>
- </genOperations>
- <genOperations ecoreOperation="jsflibraryregistry.ecore#//ArchiveFile/hashCode"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/model/templates/Header.javajetinc b/jsf/plugins/org.eclipse.jst.jsf.core/model/templates/Header.javajetinc
deleted file mode 100644
index aadfb40ce..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/model/templates/Header.javajetinc
+++ /dev/null
@@ -1,10 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties
deleted file mode 100644
index a3166c63b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-plugin.name=JavaServer Faces Core Plug-in
-plugin.provider=Eclipse.org
-plugin.facet.description=Enables the project to be deployed with JSF capabilities.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml
deleted file mode 100644
index 756813ee6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="jsfLibraries" name="jsfLibraries" schema="schema/jsfLibraries.exsd"/>
- <!-- JSF Project Facets -->
- <extension
- id="org.eclipse.jst.jsf.project.facet"
- name="%plugin.facet.extension.name"
- point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.jsf">
- <label>JavaServer Faces</label>
- <description>%plugin.facet.description</description>
- </project-facet>
-
- <project-facet-version facet="jst.jsf" version="1.1">
- <action type="install" id="jst.jsf.v11.install">
- <delegate class="org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider"/>
- </action>
- <action
- id="jst.jsf.v11.uninstall"
- type="uninstall">
- <delegate
- class="org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetUninstallDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.3"/>
- </and>
- </constraint>
- </project-facet-version>
-
- <project-facet-version facet="jst.jsf" version="1.2">
- <action type="install" id="jst.jsf.v12.install">
- <delegate
- class="org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider"/>
- </action>
- <action type="uninstall" id="jst.jsf.v12.uninstall">
- <delegate
- class="org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetUninstallDelegate"/>
- </action>
- <constraint>
- <and>
- <requires facet="jst.web" version="[2.4"/>
- </and>
- </constraint>
- </project-facet-version>
-
- <preset id="preset.jst.jsf.v1_1">
- <label>JavaServer Faces v1.1 Project</label>
- <facet id="jst.java" version="1.4" />
- <facet id="jst.web" version="2.3"/>
- <facet id="jst.jsf" version="1.1" />
- </preset>
-
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
- <supported>
- <runtime-component any="true"/>
- <facet id="jst.jsf" version="1.1,1.2"/>
- </supported>
- </extension>
-
- <extension
- name="JSF JSP File URL"
- point="org.eclipse.jst.j2ee.web.fileURL">
- <fileURL run="org.eclipse.jst.jsf.core.internal.launch.JSFFileURL"/>
- </extension>
-
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/schema/grammar-annotations.xsd b/jsf/plugins/org.eclipse.jst.jsf.core/schema/grammar-annotations.xsd
deleted file mode 100644
index 8b4a47eef..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/schema/grammar-annotations.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- targetNamespace="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema"
- version="1.0"
- attributeFormDefault="unqualified"
- elementFormDefault="unqualified"
- xmlns="http://org.eclipse.jst.jsf.core/grammarAnnotationSchema"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:element name="grammar-annotations"
- type="grammar-annotationType" />
-
- <xsd:complexType name="grammar-annotationType">
- <xsd:sequence>
- <xsd:element name="cm-element"
- type="cm-elementType" minOccurs="1" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="caseSensitive" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- <xsd:complexType name="cm-elementType">
- <xsd:sequence>
- <xsd:element name="cm-attribute" type="cm-attributeType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="cm-attributeType">
- <xsd:sequence>
- <xsd:element name="property"
- type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="propertyType">
- <xsd:sequence>
- <xsd:element name="value" type="propertyValue" minOccurs="1" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="propertyValue">
- <xsd:all></xsd:all>
- </xsd:complexType>
-</xsd:schema> \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/schema/jsfLibraries.exsd b/jsf/plugins/org.eclipse.jst.jsf.core/schema/jsfLibraries.exsd
deleted file mode 100644
index df58c9a37..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/schema/jsfLibraries.exsd
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.core" id="jsfLibraries" name="org.eclipse.jst.jsf.core.jsfLibraries"/>
- </appInfo>
- <documentation>
- This extension point allows clients to create named sets of jars for use with JavaServer Faces Applications.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="jsfLibrary" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="jsfLibrary">
- <annotation>
- <documentation>
- A named collection of jars that can be copied as a unit to WEB-INF/lib.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- A unique name for the library that will be displayed to an end user.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isImplementation" type="boolean" use="required">
- <annotation>
- <documentation>
- Flag indicating that this libary is declared to be a JSF implementation and not just a JSF component library.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="maxVersionSupported">
- <annotation>
- <documentation>
- Used to declare which JSF specification this library will support.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="v1_1">
- </enumeration>
- <enumeration value="v1_2">
- </enumeration>
- <enumeration value="UNKNOWN">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="archiveFilesDelegate" type="string" use="required">
- <annotation>
- <documentation>
- class that must extend org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry.JSFLibraryArchiveFilesDelegate to supply a collection of ArchiveFiles for the library
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry.JSFLibraryArchiveFilesDelegate"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- JSF M1
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of a jsfLibrary extension point:
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jst.jsf.core.jsfLibraries&quot;&gt;
- &lt;jsfLibrary
- name=&quot;MyComponentLib1&quot;
- isImplementation=&quot;false&quot;
- maxVersionSupported=&quot;v1_1&quot;
- archiveFilesDelegate=&quot;com.acme.jsf.libraries.MyComponentLibraryFiles&quot;/&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- Value of the attribute class must be a fully qualified name of a Java class that extends the abstract class &lt;code&gt;org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry.JSFLibraryArchiveFilesDelegate&lt;/code&gt; and has a public 0-arg constructor.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- none
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 Oracle Corporation.
-All rights reserved. This program and the accompanying materials
-are 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:
-Gerry Kessler - initial API and implementation
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java
deleted file mode 100644
index 78a88c60d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- * Ian Trimble - JSFLibraryRegistry work
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter.MaintainDefaultImplementationAdapter;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceFactoryImpl;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceImpl;
-import org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry.PluginProvidedJSFLibraryCreationHelper;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * JSF Core plugin.
- *
- * @author Gerry Kessler - Oracle, Ian Trimble - Oracle
- */
-public class JSFCorePlugin extends WTPPlugin {
- public static final String PLUGIN_ID = "org.eclipse.jst.jsf.core";//org.eclipse.jst.jsf.core.internal.JSFCorePlugin"; //$NON-NLS-1$
-
- public static final String FACET_ID = "jst.jsf"; //$NON-NLS-1$
-
- // The shared instance.
- private static JSFCorePlugin plugin;
-
- // The workspace-relative part of the URL of the JSF Library Registry
- // persistence store.
- private static final String JSF_LIBRARY_REGISTRY_URL = ".metadata/.plugins/org.eclipse.jst.jsf.core/JSFLibraryRegistry.xml"; //$NON-NLS-1$
-
- // The NS URI of the JSF Library Registry's Ecore package. (Must match
- // setting on package in Ecore model.)
- private static final String JSF_LIBRARY_REGISTRY_NSURI = "http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd"; //$NON-NLS-1$
-
- public static final String LIB_EXT_PT = "jsfLibraries"; //$NON-NLS-1$
-
- // The JSF Library Registry EMF resource instance.
- private JSFLibraryRegistryResourceImpl jsfLibraryRegistryResource = null;
-
- // The JSF Library Registry instance.
- private JSFLibraryRegistry jsfLibraryRegistry = null;
-
- /**
- * The constructor.
- */
- public JSFCorePlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- loadJSFLibraryRegistry();
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- saveJSFLibraryRegistry();
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSFCorePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the JSFLibraryRegistry EMF object.
- *
- * @return the JSFLibraryRegistry EMF object.
- */
- public JSFLibraryRegistry getJSFLibraryRegistry() {
- return jsfLibraryRegistry;
- }
-
- /**
- * Loads the JSFLibraryRegistry EMF object from plugin-specfic workspace
- * settings location. (Called from start(BundleContext).)
- */
- public void loadJSFLibraryRegistry() {
- try {
- URL jsfLibRegURL = new URL(Platform.getInstanceLocation().getURL(), JSF_LIBRARY_REGISTRY_URL);
- URI jsfLibRegURI = URI.createURI(jsfLibRegURL.toString());
- EPackage.Registry.INSTANCE.put(JSF_LIBRARY_REGISTRY_NSURI, JSFLibraryRegistryPackageImpl.init());
- JSFLibraryRegistryResourceFactoryImpl resourceFactory = new JSFLibraryRegistryResourceFactoryImpl();
- jsfLibraryRegistryResource = (JSFLibraryRegistryResourceImpl)resourceFactory.createResource(jsfLibRegURI);
- try {
- Map options = new HashMap();
- //disable notifications during load to avoid changing stored default implementation
- options.put(XMLResource.OPTION_DISABLE_NOTIFY, Boolean.TRUE);
- jsfLibraryRegistryResource.load(options);
- jsfLibraryRegistry = (JSFLibraryRegistry)jsfLibraryRegistryResource.getContents().get(0);
- loadJSFLibraryExtensions();
- } catch(IOException ioe) {
- /**
- * Remove the 3rd throwable parameter in the statement below
- * to surpress error stack in log file since it is only
- * informational. Bug 144947.
- */
- //log(IStatus.INFO, Messages.JSFLibraryRegistry_NoLoadCreatingNew, ioe);
- log(IStatus.INFO, Messages.JSFLibraryRegistry_NoLoadCreatingNew);
- jsfLibraryRegistry = JSFLibraryRegistryFactory.eINSTANCE.createJSFLibraryRegistry();
- jsfLibraryRegistryResource.getContents().add(jsfLibraryRegistry);
- loadJSFLibraryExtensions();
- }
- //add adapter to maintain default implementation
- if (jsfLibraryRegistry != null) {
- jsfLibraryRegistry.eAdapters().add(MaintainDefaultImplementationAdapter.getInstance());
- }
- } catch(MalformedURLException mue) {
- log(IStatus.ERROR, Messages.JSFLibraryRegistry_ErrorCreatingURL, mue);
- }
- }
-
- /**
- * Creates library registry items from extension points.
- */
- private void loadJSFLibraryExtensions() {
- try {
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(JSFCorePlugin.PLUGIN_ID, JSFCorePlugin.LIB_EXT_PT);
- IExtension[] extensions = point.getExtensions();
- for (int i=0;i < extensions.length;i++){
- IExtension ext = extensions[i];
- for (int j=0;j < ext.getConfigurationElements().length;j++){
- PluginProvidedJSFLibraryCreationHelper newLibCreator = new PluginProvidedJSFLibraryCreationHelper(ext.getConfigurationElements()[j]);
- JSFLibrary newLib = newLibCreator.create();
-
- /**
- * Additional check on if a plug-in contributes jsflibraries is an expanded folder.
- * Fix related to bug 144954.
- *
- * It would be ideal to check if a plug-in is distributed as a JAR
- * before a JSFLibrary is created.
- *
- * This is a temporary solution since JARs in a JAR case is not
- * supported in this release. Bug 14496.
- */
- if (newLib != null && isJSFLibinExpandedFolder(newLib))
- jsfLibraryRegistry.addJSFLibrary(newLib);
- }
- }
- } catch (InvalidRegistryObjectException e) {
- log(IStatus.ERROR, Messages.JSFLibraryRegistry_ErrorLoadingFromExtPt, e);
- }
- }
-
- /**
- * Saves the JSFLibraryRegistry EMF object from plugin-specfic workspace
- * settings location. (Called from stop(BundleContext).)
- */
- public boolean saveJSFLibraryRegistry() {
- boolean saved = false;
- if (jsfLibraryRegistryResource != null) {
- try {
- jsfLibraryRegistryResource.save(Collections.EMPTY_MAP);
- saved = true;
- } catch(IOException ioe) {
- log(IStatus.ERROR, Messages.JSFLibraryRegistry_ErrorSaving, ioe);
- }
- } else {
- log(IStatus.ERROR, Messages.JSFLibraryRegistry_ErrorSaving);
- }
- return saved;
- }
-
- public static void log(final Exception e, final String msg) {
- final ILog log = getDefault().getLog();
-
- log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity Severity (IStatus constant) of log entry
- * @param message Human-readable message describing log entry
- * @param ex Throwable instance (can be null)
- */
- public static void log(int severity, String message, Throwable ex) {
- getDefault().getLog().log(new Status(severity, PLUGIN_ID, IStatus.OK, message, ex));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity Severity (IStatus constant) of log entry
- * @param message Human-readable message describing log entry
- */
- public static void log(int severity, String message) {
- log(severity, message, null);
- }
-
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * To check if a jsflibraries contribution plug-in is
- * distributed in a JAR.
- *
- * This is temporary for bug 144954. Need to be removed when
- * fixing 144996.
- *
- * @param jsflib
- * @return
- */
- private boolean isJSFLibinExpandedFolder(JSFLibrary jsflib) {
- boolean exists = false;
- if (jsflib instanceof PluginProvidedJSFLibrary) { // No need to check probably
- if (jsflib.getArchiveFiles().size() > 0) {
- ArchiveFile ar = (ArchiveFile) jsflib.getArchiveFiles().get(0);
- String resolvedSourceLocation = ar.getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- exists = new File(resolvedSourceLocation).exists();
- }
- }
- }
- return exists;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java
deleted file mode 100644
index ef1555c52..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/Messages.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- * Ian Trimble - changed to work correctly with org.eclipse.osgi.util.NLS
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * String resource handler.
- *
- * @author Gerry Kessler - Oracle, Ian Trimble - Oracle
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.core.internal.messages"; //$NON-NLS-1$
-
- public static String JSFLibraryRegistry_ErrorCreatingURL;
- public static String JSFLibraryRegistry_NoLoadCreatingNew;
- public static String JSFLibraryRegistry_ErrorSaving;
- public static String JSFLibraryRegistry_DEFAULT_IMPL_LABEL;
- public static String JSFLibraryRegistry_ErrorLoadingFromExtPt;
-
- public static String JSFFacetInstallDataModelProvider_ValidateServletName;
- public static String JSFFacetInstallDataModelProvider_ValidateJSFImpl;
- public static String JSFFacetInstallDataModelProvider_ValidateConfigFileEmpty;
- public static String JSFFacetInstallDataModelProvider_ValidateConfigFilePath;
- public static String JSFFacetInstallDataModelProvider_ValidateConfigFileRelative1;
- public static String JSFFacetInstallDataModelProvider_ValidateConfigFileRelative2;
- public static String JSFFacetInstallDataModelProvider_ValidateConfigFileXML;
- public static String JSFFacetInstallDataModelProvider_ValidateConfigFileSlashes;
-
- public static String ArchiveFileImpl_CannotCopyFile;
- public static String ArchiveFileImpl_CannotCloseFile;
- public static String ArchiveFileImpl_CannotLocatePluginRelativeFile;
-
- public static String PluginProvidedJSFLibraryCreationHelper_ErrorCreating;
- public static String PluginProvidedJSFLibraryCreationHelper_ErrorMultipleDefinition;
-
- public static String JSFUtils_ErrorCreatingConfigFile;
- public static String JSFUtils_ErrorClosingConfigFile;
-
- public static String JSFAppConfigUtils_ErrorOpeningJarFile;
-
- public static String JARFileJSFAppConfigProvider_ErrorLoadingModel;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/J2EEModuleDependencyDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/J2EEModuleDependencyDelegate.java
deleted file mode 100644
index 8c5bad155..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/J2EEModuleDependencyDelegate.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryconfig;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.common.operations.UpdateJavaBuildPathOperation;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-/**
- * The <b>J2EEModuleDependencyDelegate</b> provide services to update
- * J2EE module dependencies and java build path when JSF libraries
- * are referenced in a web application.
- *
- * @author Justin Chen - Oracle
- *
- */
-public class J2EEModuleDependencyDelegate {
- private IProject project = null;
- private ClasspathModel model = null;
-
- /**
- * @param project
- */
- public J2EEModuleDependencyDelegate(IProject project) {
- this.project = project;
- this.model = newClasspathModel(project);
- }
-
- /**
- * @param jsfLibrary
- * @param toDeploy
- * @param monitor
- */
- public void addProjectDependency(JSFLibrary jsfLibrary, boolean toDeploy, IProgressMonitor monitor) {
- IPath[] jarPaths = JSFUtils.getJARPathforJSFLib(jsfLibrary);
- this.updateProjectDependency(jarPaths, toDeploy, monitor);
- }
-
- /**
- * @param jsfLibrary
- * @param monitor
- */
- public void removeProjectDependency(JSFLibrary jsfLibrary, IProgressMonitor monitor) {
- IPath[] elements = JSFUtils.getJARPathforJSFLib(jsfLibrary);
- this.removeProjectDependency_(elements, monitor);
- }
-
- /**
- * @param jsfLibrary
- * @param monitor
- */
- public void addLibraryToBuildPath(JSFLibraryDecorator jsfLibrary, IProgressMonitor monitor) {
- IPath[] elements = JSFUtils.getJARPathforJSFLib(jsfLibrary.getLibrary());
- this.updateProjectDependency(elements, false, monitor);
- }
-
- /**
- * To update J2EE Module dependencies from given collection of JARs and deployment flag.
- *
- * @param elems
- * @param deployme
- * @param monitor
- */
- private void updateProjectDependency(IPath[] elems, boolean deployme, IProgressMonitor monitor) {
-
- ClassPathSelection selection = null;
- /**
- * For each JAR defined in a JSF Library, it is added as J2EE Module Dependency if
- * the JSF Library is checked for deployment. However, JARs are added into project build path
- * regardless if a JSF Library is checked for deployment or not.
- *
- */
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- for (int i= 0; i < elems.length; i++) {
- IVirtualComponent archive = ComponentCore.createArchiveComponent( model.getComponent().getProject(), type + elems[i].toString());
-
- // Added as J2EE Module Dependency if need to be deployed
- if (deployme) {
- ArrayList vlist = new ArrayList(Collections.EMPTY_LIST);
- IVirtualReference[] oldrefs = model.getComponent().getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- IVirtualReference ref = ComponentCore.createReference(
- model.getComponent(),
- archive,
- new Path("/WEB-INF/lib") ); //$NON-NLS-1$
- addReferences(vlist, ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- model.getComponent().setReferences(refs);
- } else {
- // added into the path selection to update build path later.
- ClasspathElement element = createClassPathElement(archive, archive.getName(), true);
- if (selection == null) {
- selection = createClassPathSelectionForExternalJar(element);
- } else {
- selection.getClasspathElements().add(element);
- }
- model.getClassPathSelectionForWLPs().getClasspathElements().add(element);
- }
- } // end For
-
- // Add JARs into build path for selected JSF libs checked for not deploy.
- if (selection != null) {
- IRunnableWithProgress buildPathOP = createBuildPathOperationForExternalJar(selection);
- try {
- buildPathOP.run(monitor);
- } catch (InvocationTargetException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- } catch (InterruptedException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- }
- }
- }
-
- /**
- * To remove given collection of JARs from project's J2EE Module Dependencies.
- *
- * @param elems
- * @param monitor
- */
- private void removeProjectDependency_(IPath[] elems, IProgressMonitor monitor) {
-
- ClassPathSelection selection = null;
- for (int i= 0; i < elems.length; i++) {
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent( model.getComponent().getProject(), type + elems[i].toString());
-
- ArrayList vlist = new ArrayList(Collections.EMPTY_LIST);
- IVirtualReference[] oldrefs = model.getComponent().getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- // Remove the reference
- IVirtualReference ref = ComponentCore.createReference(
- model.getComponent(),
- archive,
- new Path("/WEB-INF/lib") ); //$NON-NLS-1$
- removeReference(vlist, ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- model.getComponent().setReferences(refs);
-
- // Update project classpath
- ClasspathElement element = createClassPathElement(archive, archive.getName(), false);
- if (selection == null) {
- selection = createClassPathSelectionForExternalJar(element);
- } else {
- selection.getClasspathElements().add(element);
- }
- selection.getClasspathElements().add(element);
- model.getClassPathSelectionForWLPs().getClasspathElements().remove(element);
- } // end for
-
- IRunnableWithProgress buildPathOP = createBuildPathOperationForExternalJar(selection);
- try {
- buildPathOP.run(monitor);
- } catch (InvocationTargetException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- } catch (InterruptedException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- }
- }
-
- private void removeReference(ArrayList vList, IVirtualReference ref) {
- IVirtualReference elem = null;
- for (int i = 0; i < vList.size(); i++) {
- elem = (IVirtualReference)vList.get(i);
- if (elem.getReferencedComponent().getName().equalsIgnoreCase(ref.getReferencedComponent().getName())) {
- vList.remove(elem);
- }
- }
- }
-
- /**
- * Check if archive component already exists
- * But, how to tell if two references are equal?
- *
- * @param vlist
- * @param ref
- */
- private void addReferences(ArrayList vlist, IVirtualReference ref) {
- IVirtualReference elem = null;
- boolean exist = false;
- for (int i = 0; i < vlist.size(); i++) {
- elem = (IVirtualReference)vlist.get(i);
- if (elem.getReferencedComponent().getName().equalsIgnoreCase(ref.getReferencedComponent().getName())) {
- exist = true;
- break;
- }
- }
- if ( !exist) {
- vlist.add(ref);
- }
- }
-
- private ClasspathModel newClasspathModel(IProject project) {
- ClasspathModel model = new ClasspathModel(null);
- model.setProject(project);
- if( model.getComponent() != null ){
- updateModelManifest(model);
- }
- return model;
- }
-
- private ClasspathElement createClassPathElement(
- IVirtualComponent archiveComp,
- String unresolvedName,
- boolean addedToPath) {
-
- URI uri = URI.createURI(ModuleURIUtil.getHandleString(archiveComp));
- ClasspathElement element = new ClasspathElement(uri);
- element.setValid(false);
- element.setSelected(addedToPath);
- element.setRelativeText(unresolvedName);
- element.setText(unresolvedName);
- element.setEarProject(null);
- return element;
- }
-
- private ClassPathSelection createClassPathSelectionForExternalJar(ClasspathElement element){
- ClassPathSelection selection = new ClassPathSelection();
- selection.getClasspathElements().add(element);
- return selection;
- }
-
- private IRunnableWithProgress createBuildPathOperationForExternalJar(ClassPathSelection selection) {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- return WTPUIPlugin.getRunnableWithProgress(new UpdateJavaBuildPathOperation(javaProject, selection));
- }
-
- private void updateModelManifest(ClasspathModel model) {
- if (JemProjectUtilities.isBinaryProject(project) || model.getAvailableEARComponents().length == 0)
- return;
-
- IContainer root = null;
- IFile manifestFile = null;
- if (project != null) {
- root = project;
- } else {
- root = JemProjectUtilities.getSourceFolderOrFirst(project, null);
- }
- if (root != null) {
- manifestFile = root.getFile(new Path(J2EEConstants.MANIFEST_URI));
- }
- if (manifestFile == null || !manifestFile.exists())
- return;
-
- InputStream in = null;
- try {
- in = manifestFile.getContents();
- ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
- model.primSetManifest(mf);
- } catch (CoreException e) {
- model.primSetManifest(new ArchiveManifestImpl());
- } catch (IOException iox) {
- model.primSetManifest(new ArchiveManifestImpl());
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- //Ignore
- }
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModelAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModelAdapter.java
deleted file mode 100644
index f9e59379d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModelAdapter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryconfig;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-
-/**
- *
- * @author Justin Chen - Oracle
- */
-public class JSFLibraryConfigModelAdapter {
- private IProject project;
- private JSFLibraryRegistry jsfLibReg;
- private List colJSFImplLib;
- private List colJSFCompLib;
- private JSFLibraryConfigPersistData data;
- private JSFLibraryDecorator preSelectedJSFImpl = null;
-
- /**
- * @param project
- */
- public JSFLibraryConfigModelAdapter(IProject project) {
- this.project = project;
- this.jsfLibReg = JSFCorePlugin.getDefault().getJSFLibraryRegistry();
- this.data = new JSFLibraryConfigPersistData(this.project);
- preSelectedJSFImpl = data.getSelectedJSFLibImplementation();
- }
-
- /**
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProject()
- */
- public IProject getProject() {
- return project;
- }
-
- /**
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getJSFLibraryRegistry()
- */
- public JSFLibraryRegistry getJSFLibraryRegistry() {
- return jsfLibReg;
- }
-
- /**
- * (non-Javadoc)
- * @return List
- * @see org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFImplementationLibraries()
- */
- public List getProjectJSFImplementationLibraries() {
-
- if (colJSFImplLib == null) {
- List list = new ArrayList(Collections.EMPTY_LIST);
- if (data.getSelectedJSFLibImplementation() != null) {
- list.add(data.getSelectedJSFLibImplementation());
- }
- colJSFImplLib = buildJSFLibraryDecoratorList(jsfLibReg.getImplJSFLibraries(), list);
- }
- return colJSFImplLib;
-
- }
-
- /**
- * (non-Javadoc)
- * @return List
- * @see org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFComponentLibraries()
- */
- public List getProjectJSFComponentLibraries() {
-
- if (colJSFCompLib == null) {
- colJSFCompLib = buildJSFLibraryDecoratorList(jsfLibReg.getNonImplJSFLibraries(),
- data.getSelectedJSFLibComponent() );
- }
- return colJSFCompLib;
-
- }
-
- /**
- * (non-Javadoc)
- * @param selJSFLibImpl
- * @param selJSFLibComp
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.IJSFLibraryDecoratorProvider#saveModel(java.util.List, java.util.List)
- */
- public void saveData(List selJSFLibImpl, List selJSFLibComp) {
-
- data.saveData(selJSFLibImpl, selJSFLibComp);
-
- // flush current list
- colJSFImplLib = null;
- colJSFCompLib = null;
-
- }
-
- /**
- * @return JSFLibraryDecorator
- */
- public JSFLibraryDecorator getSelectedJSFImplementation() {
- return data.getSelectedJSFLibImplementation();
- }
-
- /**
- * @return JSFLibraryDecorator
- */
- public JSFLibraryDecorator getPreviousJSFImplementation() {
- return preSelectedJSFImpl;
- }
-
- /**
- * @return List
- */
- public List getSelectedJSFComponent() {
- return data.getSelectedJSFLibComponent();
- }
-
-
- private List buildJSFLibraryDecoratorList(EList wsJSFLibs, List pjJSFLibs) {
-
- List list = new ArrayList(Collections.EMPTY_LIST);
-
- JSFLibraryDecorator newPrjJSFLib;
- JSFLibraryDecorator prjJSFLib = null;
- JSFLibrary jsfLib;
- Iterator it = wsJSFLibs.iterator();
- while(it.hasNext()) {
- jsfLib = (JSFLibrary)it.next();
-
- Iterator itPrjLibs = pjJSFLibs.iterator();
- boolean selected = false;
- while(itPrjLibs.hasNext()) {
- prjJSFLib = (JSFLibraryDecorator)itPrjLibs.next();
- selected = prjJSFLib.getID().equals(jsfLib.getID());
- if (selected) {
- break;
- }
- }
- if (selected && prjJSFLib != null) {
- newPrjJSFLib = prjJSFLib;
- } else {
- newPrjJSFLib = new JSFLibraryDecorator(jsfLib, false, true);
- }
- list.add(newPrjJSFLib);
- }
-
- return list;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigPersistData.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigPersistData.java
deleted file mode 100644
index 924abb0c6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigPersistData.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryconfig;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtils;
-
-/**
- * This class is responsible for persist and retore
- * the configuration data for <b>JSFLibraryConfigControl</b>.
- *
- * @author Justin Chen - Oracle
- *
- */
-public class JSFLibraryConfigPersistData {
- final protected static String SPTR_TUPLE = ":"; //$NON-NLS-1$
- final protected static String EO_TUPLE = ";"; //$NON-NLS-1$
-
- private IProject project;
- private JSFLibraryRegistry jsfLibReg;
- private JSFLibraryDecorator selJSFLibImpl = null;
- private List selJSFLibComp = null;
-
- /**
- * @param project
- */
- protected JSFLibraryConfigPersistData(IProject project) {
- this.project = project;
- this.jsfLibReg = JSFCorePlugin.getDefault().getJSFLibraryRegistry();
- }
-
- /**
- * @return JSFLibraryDecorator
- */
- protected JSFLibraryDecorator getSelectedJSFLibImplementation() {
-
- try {
- if ( selJSFLibImpl == null ) {
- String strImplLibs = ((IResource)project).getPersistentProperty(new QualifiedName("", JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES));
- selJSFLibImpl = getSelectedJSFLibImpl(getTuples(strImplLibs));
- }
- } catch (CoreException e) {
- if (JSFCorePlugin.getDefault().getJSFLibraryRegistry() != null) {
- JSFLibrary jsfLib = JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation();
- if (jsfLib != null) {
- selJSFLibImpl = new JSFLibraryDecorator(jsfLib, true, true);
- }
- } else {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- }
- }
- return selJSFLibImpl;
-
- }
-
- /**
- * @return List
- */
- protected List getSelectedJSFLibComponent() {
-
- try {
- if ( selJSFLibComp == null ) {
- selJSFLibComp = new ArrayList(Collections.EMPTY_LIST);
- String strCompLibs = ((IResource)project).getPersistentProperty(new QualifiedName("", JSFUtils.PP_JSF_COMPONENT_LIBRARIES));
- initJSFCompLibs(getTuples(strCompLibs), selJSFLibComp);
- }
- } catch (CoreException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- }
- return selJSFLibComp;
- }
-
- /**
- * To persist configuration data as a project resource.
- *
- * @param selJSFLibImpl
- * @param selJSFLibComp
- */
- protected void saveData(List selJSFLibImpl, List selJSFLibComp) {
- try {
- ((IResource)project).setPersistentProperty(new QualifiedName("", JSFUtils.PP_JSF_IMPLEMENTATION_LIBRARIES), generatePersistString(selJSFLibImpl));
- ((IResource)project).setPersistentProperty(new QualifiedName("", JSFUtils.PP_JSF_COMPONENT_LIBRARIES), generatePersistString(selJSFLibComp));
-
- this.selJSFLibImpl = null;
- this.selJSFLibComp = null;
-
- } catch (CoreException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- }
- }
-
- private JSFLibraryDecorator getSelectedJSFLibImpl(List jsfLibTuples) {
- Iterator itTuple = jsfLibTuples.iterator();
- while(itTuple.hasNext()) {
- Tuple tuple = (Tuple)itTuple.next();
-
- if ( jsfLibReg != null ) {
- JSFLibrary jsfLib = jsfLibReg.getJSFLibraryByID(tuple.ID);
- if (jsfLib != null) {
- return new JSFLibraryDecorator(jsfLib, tuple.selected, tuple.deploy);
- }
- }
- }
- return null;
- }
-
- private void initJSFCompLibs(List jsfLibTuples, List JSFCompLibs) {
- Iterator itTuple = jsfLibTuples.iterator();
- while(itTuple.hasNext()) {
- Tuple tuple = (Tuple)itTuple.next();
-
- if ( jsfLibReg != null ) {
- JSFLibrary jsfLib = jsfLibReg.getJSFLibraryByID(tuple.ID);
- if (jsfLib != null) {
- JSFLibraryDecorator newJSFLibDcrt = new JSFLibraryDecorator(jsfLib, tuple.selected, tuple.deploy);
- JSFCompLibs.add(newJSFLibDcrt);
- }
- }
- }
- }
-
- private String generatePersistString(List list) {
- JSFLibraryDecorator jsfLibItem;
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < list.size(); i++) {
- jsfLibItem = (JSFLibraryDecorator)list.get(i);
- sb = sb.append(jsfLibItem.generatePersistString());
- sb.append(JSFLibraryConfigPersistData.EO_TUPLE);
- }
- return sb.toString();
- }
-
- private List getTuples(String strJSFLibs) {
- List list = new ArrayList(Collections.EMPTY_LIST);
-
- if (strJSFLibs != null) {
- String patternStr = JSFLibraryConfigPersistData.EO_TUPLE;
- String[] fields = strJSFLibs.split(patternStr);
- if (strJSFLibs.length() > 0) {
- Tuple tuple;
- for (int i = 0; i < fields.length; i++) {
- tuple = new Tuple(fields[i]);
- list.add(tuple);
- }
- }
- }
-
- return list;
- }
-
-
- class Tuple {
- private String ID;
- private boolean selected = false;
- private boolean deploy = true;
-
- Tuple(String ID, boolean selected, boolean deploy) {
- this.ID = ID;
- this.selected = selected;
- this.deploy = deploy;
- }
- // parse tuple = ID:selected:deploy
- Tuple(String tuple) {
- String[] fields = tuple.split(JSFLibraryConfigPersistData.SPTR_TUPLE);
- this.ID = fields[0];
- this.selected = Boolean.valueOf(fields[1]).booleanValue();
- this.deploy = Boolean.valueOf(fields[2]).booleanValue();
- }
-
- String getID() {
- return ID;
- }
-
- boolean isSelected() {
- return selected;
- }
-
- boolean needDeploy() {
- return deploy;
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryDecorator.java
deleted file mode 100644
index 11e3e1f0e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryDecorator.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryconfig;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl;
-
-/**
- * Additional functionality to check if a JSF libary
- * is selected and needs to be deloyed.
- *
- * @author Justin Chen - Oracle
- */
-public class JSFLibraryDecorator extends JSFLibraryImpl {
- private JSFLibrary jsfLib;
- private boolean check4Deploy; // Initialized from default in workspace
- private boolean isSelected = false; // selected for project
-
- /**
- * @param jsfLib
- * @param selected
- * @param deploy
- */
- public JSFLibraryDecorator(JSFLibrary jsfLib, boolean selected, boolean deploy) {
- this.jsfLib = jsfLib;
- this.isSelected = selected;
- this.check4Deploy = deploy;
- }
-
- /**
- * @return JSFLibrary
- */
- public JSFLibrary getLibrary() {
- return jsfLib;
- }
-
- /**
- * Return true if the JSF library needs to be deployed to server.
- * Otheriwse, return false.
- *
- * The value is initialized from default value defined in JSF Library Registry.
- *
- * @return boolean
- */
- public boolean checkForDeploy() {
- return check4Deploy;
- }
-
- /**
- * Return true if the JSF library is referenced
- * for the project. Otherwise, return false.
- * @return boolean
- */
- public boolean isSelected() {
- return isSelected;
- }
-
- /**
- * @param deploy
- */
- public void setDeployment(boolean deploy) {
- this.check4Deploy = deploy;
- }
-
- /**
- * @param selected
- */
- public void setSelected(boolean selected) {
- this.isSelected = selected;
- }
-
- /**
- * @return String
- */
- protected String generatePersistString() {
- String sptr = JSFLibraryConfigPersistData.SPTR_TUPLE;
- return this.getID() + sptr + String.valueOf(this.isSelected()) + sptr + String.valueOf(this.checkForDeploy());
- }
-
- public String getID() {
- return jsfLib.getID();
- }
-
- public String getName() {
- return jsfLib.getName();
- }
-
- public boolean isImplementation() {
- return jsfLib.isImplementation();
- }
-
- public EList getArchiveFiles() {
- return jsfLib.getArchiveFiles();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java
deleted file mode 100644
index bbe4c80cf..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/ArchiveFile.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Archive File</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#isRelativeToWorkspace <em>Relative To Workspace</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getSourceLocation <em>Source Location</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getRelativeDestLocation <em>Relative Dest Location</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getJSFLibrary <em>JSF Library</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getArchiveFile()
- * @model
- * @generated
- */
-public interface ArchiveFile extends EObject{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Returns the value of the '<em><b>Source Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source Location</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source Location</em>' attribute.
- * @see #setSourceLocation(String)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getArchiveFile_SourceLocation()
- * @model required="true"
- * @generated
- */
- String getSourceLocation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getSourceLocation <em>Source Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * If the value passed is found to be relative to the workspace, a
- * workspace-relative location is stored; to prevent this behaviour, call
- * isRelativeToWorkspace(false) before calling this method.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source Location</em>' attribute.
- * @see #getSourceLocation()
- * @generated
- */
- void setSourceLocation(String value);
-
- /**
- * Returns the value of the '<em><b>Relative To Workspace</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Relative To Workspace</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Relative To Workspace</em>' attribute.
- * @see #setRelativeToWorkspace(boolean)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getArchiveFile_RelativeToWorkspace()
- * @model default="true" required="true"
- * @generated
- */
- boolean isRelativeToWorkspace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#isRelativeToWorkspace <em>Relative To Workspace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Relative To Workspace</em>' attribute.
- * @see #isRelativeToWorkspace()
- * @generated
- */
- void setRelativeToWorkspace(boolean value);
-
- /**
- * Returns the value of the '<em><b>Relative Dest Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Relative Dest Location</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Relative Dest Location</em>' attribute.
- * @see #setRelativeDestLocation(String)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getArchiveFile_RelativeDestLocation()
- * @model required="true"
- * @generated
- */
- String getRelativeDestLocation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getRelativeDestLocation <em>Relative Dest Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Relative Dest Location</em>' attribute.
- * @see #getRelativeDestLocation()
- * @generated
- */
- void setRelativeDestLocation(String value);
-
- /**
- * Returns the value of the '<em><b>JSF Library</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getArchiveFiles <em>Archive Files</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>JSF Library</em>' container reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>JSF Library</em>' container reference.
- * @see #setJSFLibrary(JSFLibrary)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getArchiveFile_JSFLibrary()
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getArchiveFiles
- * @model opposite="ArchiveFiles" required="true"
- * @generated
- */
- JSFLibrary getJSFLibrary();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getJSFLibrary <em>JSF Library</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>JSF Library</em>' container reference.
- * @see #getJSFLibrary()
- * @generated
- */
- void setJSFLibrary(JSFLibrary value);
-
- /**
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Path</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getPath();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getName();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true"
- * @generated
- */
- boolean exists();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" objectRequired="true"
- * @generated
- */
- boolean equals(Object object);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true"
- * @generated
- */
- int hashCode();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" baseDestLocationRequired="true"
- * @generated
- */
- boolean copyTo(String baseDestLocation);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- String getResolvedSourceLocation();
-
-} // ArchiveFile
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java
deleted file mode 100644
index b664d04bc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibrary.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JSF Library</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getID <em>ID</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getJSFVersion <em>JSF Version</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isDeployed <em>Deployed</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isImplementation <em>Implementation</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getArchiveFiles <em>Archive Files</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary()
- * @model
- * @generated
- */
-public interface JSFLibrary extends EObject{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Returns the value of the '<em><b>ID</b></em>' attribute.
- * The default value is <code>""</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>ID</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>ID</em>' attribute.
- * @see #setID(String)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary_ID()
- * @model default="" id="true" required="true"
- * @generated
- */
- String getID();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getID <em>ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>ID</em>' attribute.
- * @see #getID()
- * @generated
- */
- void setID(String value);
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary_Name()
- * @model required="true"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>JSF Version</b></em>' attribute.
- * The default value is <code>"UNKNOWN"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>JSF Version</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>JSF Version</em>' attribute.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion
- * @see #setJSFVersion(JSFVersion)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary_JSFVersion()
- * @model default="UNKNOWN" required="true"
- * @generated
- */
- JSFVersion getJSFVersion();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getJSFVersion <em>JSF Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>JSF Version</em>' attribute.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion
- * @see #getJSFVersion()
- * @generated
- */
- void setJSFVersion(JSFVersion value);
-
- /**
- * Returns the value of the '<em><b>Deployed</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Deployed</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Deployed</em>' attribute.
- * @see #setDeployed(boolean)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary_Deployed()
- * @model default="true" required="true"
- * @generated
- */
- boolean isDeployed();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isDeployed <em>Deployed</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Deployed</em>' attribute.
- * @see #isDeployed()
- * @generated
- */
- void setDeployed(boolean value);
-
- /**
- * Returns the value of the '<em><b>Implementation</b></em>' attribute.
- * The default value is <code>"false"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Implementation</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Implementation</em>' attribute.
- * @see #setImplementation(boolean)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary_Implementation()
- * @model default="false" required="true"
- * @generated
- */
- boolean isImplementation();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isImplementation <em>Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Implementation</em>' attribute.
- * @see #isImplementation()
- * @generated
- */
- void setImplementation(boolean value);
-
- /**
- * Returns the value of the '<em><b>Archive Files</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile}.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getJSFLibrary <em>JSF Library</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Archive Files</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Archive Files</em>' containment reference list.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibrary_ArchiveFiles()
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getJSFLibrary
- * @model type="org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile" opposite="JSFLibrary" containment="true"
- * @generated
- */
- EList getArchiveFiles();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" fullPathRequired="true"
- * @generated
- */
- boolean containsArchiveFile(String fullPath);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- JSFLibrary getWorkingCopy();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model otherLibraryRequired="true"
- * @generated
- */
- void updateValues(JSFLibrary otherLibrary);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" baseDestLocationRequired="true"
- * @generated
- */
- boolean copyTo(String baseDestLocation);
-
-} // JSFLibrary
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java
deleted file mode 100644
index dc2912b40..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistry.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.core.internal.Messages;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JSF Library Registry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getDefaultImplementationID <em>Default Implementation ID</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getJSFLibraries <em>JSF Libraries</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getPluginProvidedJSFLibraries <em>Plugin Provided JSF Libraries</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibraryRegistry()
- * @model
- * @generated
- */
-public interface JSFLibraryRegistry extends EObject{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Returns the value of the '<em><b>Default Implementation ID</b></em>' attribute.
- * The default value is <code>""</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Default Implementation ID</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Default Implementation ID</em>' attribute.
- * @see #setDefaultImplementationID(String)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibraryRegistry_DefaultImplementationID()
- * @model default=""
- * @generated
- */
- String getDefaultImplementationID();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getDefaultImplementationID <em>Default Implementation ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Default Implementation ID</em>' attribute.
- * @see #getDefaultImplementationID()
- * @generated
- */
- void setDefaultImplementationID(String value);
-
- public static final String DEFAULT_IMPL_LABEL = Messages.JSFLibraryRegistry_DEFAULT_IMPL_LABEL;
-
- /**
- * Returns the value of the '<em><b>JSF Libraries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>JSF Libraries</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>JSF Libraries</em>' containment reference list.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibraryRegistry_JSFLibraries()
- * @model type="org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary" containment="true"
- * @generated
- */
- EList getJSFLibraries();
-
- /**
- * Returns the value of the '<em><b>Plugin Provided JSF Libraries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Plugin Provided JSF Libraries</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Plugin Provided JSF Libraries</em>' containment reference list.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFLibraryRegistry_PluginProvidedJSFLibraries()
- * @model type="org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary" containment="true" transient="true"
- * @generated
- */
- EList getPluginProvidedJSFLibraries();
-
- /**
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Default Implementation</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @model kind="operation" required="true"
- * @generated
- */
- JSFLibrary getDefaultImplementation();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model implementationRequired="true"
- * @generated
- */
- void setDefaultImplementation(JSFLibrary value);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" IDRequired="true"
- * @generated
- */
- JSFLibrary getJSFLibraryByID(String ID);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" many="false" nameRequired="true"
- * @generated
- */
- EList getJSFLibrariesByName(String name);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" required="true" many="false"
- * @generated
- */
- EList getImplJSFLibraries();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" required="true" many="false"
- * @generated
- */
- EList getNonImplJSFLibraries();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" required="true" many="false"
- * @generated
- */
- EList getAllJSFLibraries();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" libraryRequired="true"
- * @generated
- */
- boolean addJSFLibrary(JSFLibrary library);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model required="true" libraryRequired="true"
- * @generated
- */
- boolean removeJSFLibrary(JSFLibrary library);
-
-} // JSFLibraryRegistry
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java
deleted file mode 100644
index 0953c0e99..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage
- * @generated
- */
-public interface JSFLibraryRegistryFactory extends EFactory{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- JSFLibraryRegistryFactory eINSTANCE = new org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryFactoryImpl();
-
- /**
- * Returns a new object of class '<em>JSF Library Registry</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>JSF Library Registry</em>'.
- * @generated
- */
- JSFLibraryRegistry createJSFLibraryRegistry();
-
- /**
- * Returns a new object of class '<em>JSF Library</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>JSF Library</em>'.
- * @generated
- */
- JSFLibrary createJSFLibrary();
-
- /**
- * Returns a new object of class '<em>Archive File</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Archive File</em>'.
- * @generated
- */
- ArchiveFile createArchiveFile();
-
- /**
- * Returns a new object of class '<em>Plugin Provided JSF Library</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Plugin Provided JSF Library</em>'.
- * @generated
- */
- PluginProvidedJSFLibrary createPluginProvidedJSFLibrary();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- JSFLibraryRegistryPackage getJSFLibraryRegistryPackage();
-
-} //JSFLibraryRegistryFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java
deleted file mode 100644
index 3e00cb703..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFLibraryRegistryPackage.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory
- * @model kind="package"
- * @generated
- */
-public interface JSFLibraryRegistryPackage extends EPackage{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "jsflibraryregistry";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/webtools/jsf/schema/jsflibraryregistry.xsd";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "jsflibreg";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- JSFLibraryRegistryPackage eINSTANCE = org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryImpl <em>JSF Library Registry</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryImpl
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl#getJSFLibraryRegistry()
- * @generated
- */
- int JSF_LIBRARY_REGISTRY = 0;
-
- /**
- * The feature id for the '<em><b>Default Implementation ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID = 0;
-
- /**
- * The feature id for the '<em><b>JSF Libraries</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY_REGISTRY__JSF_LIBRARIES = 1;
-
- /**
- * The feature id for the '<em><b>Plugin Provided JSF Libraries</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES = 2;
-
- /**
- * The number of structural features of the the '<em>JSF Library Registry</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY_REGISTRY_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl <em>JSF Library</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl#getJSFLibrary()
- * @generated
- */
- int JSF_LIBRARY = 1;
-
- /**
- * The feature id for the '<em><b>ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY__ID = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY__NAME = 1;
-
- /**
- * The feature id for the '<em><b>JSF Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY__JSF_VERSION = 2;
-
- /**
- * The feature id for the '<em><b>Deployed</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY__DEPLOYED = 3;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY__IMPLEMENTATION = 4;
-
- /**
- * The feature id for the '<em><b>Archive Files</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY__ARCHIVE_FILES = 5;
-
- /**
- * The number of structural features of the the '<em>JSF Library</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JSF_LIBRARY_FEATURE_COUNT = 6;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.ArchiveFileImpl <em>Archive File</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.ArchiveFileImpl
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl#getArchiveFile()
- * @generated
- */
- int ARCHIVE_FILE = 2;
-
- /**
- * The feature id for the '<em><b>Relative To Workspace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__RELATIVE_TO_WORKSPACE = 0;
-
- /**
- * The feature id for the '<em><b>Source Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__SOURCE_LOCATION = 1;
-
- /**
- * The feature id for the '<em><b>Relative Dest Location</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__RELATIVE_DEST_LOCATION = 2;
-
- /**
- * The feature id for the '<em><b>JSF Library</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE__JSF_LIBRARY = 3;
-
- /**
- * The number of structural features of the the '<em>Archive File</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARCHIVE_FILE_FEATURE_COUNT = 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.PluginProvidedJSFLibraryImpl <em>Plugin Provided JSF Library</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.PluginProvidedJSFLibraryImpl
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl#getPluginProvidedJSFLibrary()
- * @generated
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY = 3;
-
- /**
- * The feature id for the '<em><b>ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__ID = JSF_LIBRARY__ID;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__NAME = JSF_LIBRARY__NAME;
-
- /**
- * The feature id for the '<em><b>JSF Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__JSF_VERSION = JSF_LIBRARY__JSF_VERSION;
-
- /**
- * The feature id for the '<em><b>Deployed</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__DEPLOYED = JSF_LIBRARY__DEPLOYED;
-
- /**
- * The feature id for the '<em><b>Implementation</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__IMPLEMENTATION = JSF_LIBRARY__IMPLEMENTATION;
-
- /**
- * The feature id for the '<em><b>Archive Files</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES = JSF_LIBRARY__ARCHIVE_FILES;
-
- /**
- * The feature id for the '<em><b>Plugin ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID = JSF_LIBRARY_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>Plugin Provided JSF Library</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PLUGIN_PROVIDED_JSF_LIBRARY_FEATURE_COUNT = JSF_LIBRARY_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion <em>JSF Version</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryPackageImpl#getJSFVersion()
- * @generated
- */
- int JSF_VERSION = 4;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry <em>JSF Library Registry</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>JSF Library Registry</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry
- * @generated
- */
- EClass getJSFLibraryRegistry();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getDefaultImplementationID <em>Default Implementation ID</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Default Implementation ID</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getDefaultImplementationID()
- * @see #getJSFLibraryRegistry()
- * @generated
- */
- EAttribute getJSFLibraryRegistry_DefaultImplementationID();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getJSFLibraries <em>JSF Libraries</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>JSF Libraries</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getJSFLibraries()
- * @see #getJSFLibraryRegistry()
- * @generated
- */
- EReference getJSFLibraryRegistry_JSFLibraries();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getPluginProvidedJSFLibraries <em>Plugin Provided JSF Libraries</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Plugin Provided JSF Libraries</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry#getPluginProvidedJSFLibraries()
- * @see #getJSFLibraryRegistry()
- * @generated
- */
- EReference getJSFLibraryRegistry_PluginProvidedJSFLibraries();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary <em>JSF Library</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>JSF Library</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary
- * @generated
- */
- EClass getJSFLibrary();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getID <em>ID</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>ID</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getID()
- * @see #getJSFLibrary()
- * @generated
- */
- EAttribute getJSFLibrary_ID();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getName()
- * @see #getJSFLibrary()
- * @generated
- */
- EAttribute getJSFLibrary_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getJSFVersion <em>JSF Version</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>JSF Version</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getJSFVersion()
- * @see #getJSFLibrary()
- * @generated
- */
- EAttribute getJSFLibrary_JSFVersion();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isDeployed <em>Deployed</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Deployed</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isDeployed()
- * @see #getJSFLibrary()
- * @generated
- */
- EAttribute getJSFLibrary_Deployed();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isImplementation <em>Implementation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Implementation</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#isImplementation()
- * @see #getJSFLibrary()
- * @generated
- */
- EAttribute getJSFLibrary_Implementation();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getArchiveFiles <em>Archive Files</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Archive Files</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary#getArchiveFiles()
- * @see #getJSFLibrary()
- * @generated
- */
- EReference getJSFLibrary_ArchiveFiles();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile <em>Archive File</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Archive File</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile
- * @generated
- */
- EClass getArchiveFile();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getSourceLocation <em>Source Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Source Location</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getSourceLocation()
- * @see #getArchiveFile()
- * @generated
- */
- EAttribute getArchiveFile_SourceLocation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#isRelativeToWorkspace <em>Relative To Workspace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Relative To Workspace</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#isRelativeToWorkspace()
- * @see #getArchiveFile()
- * @generated
- */
- EAttribute getArchiveFile_RelativeToWorkspace();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getRelativeDestLocation <em>Relative Dest Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Relative Dest Location</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getRelativeDestLocation()
- * @see #getArchiveFile()
- * @generated
- */
- EAttribute getArchiveFile_RelativeDestLocation();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getJSFLibrary <em>JSF Library</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the container reference '<em>JSF Library</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile#getJSFLibrary()
- * @see #getArchiveFile()
- * @generated
- */
- EReference getArchiveFile_JSFLibrary();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary <em>Plugin Provided JSF Library</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Plugin Provided JSF Library</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary
- * @generated
- */
- EClass getPluginProvidedJSFLibrary();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary#getPluginID <em>Plugin ID</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Plugin ID</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary#getPluginID()
- * @see #getPluginProvidedJSFLibrary()
- * @generated
- */
- EAttribute getPluginProvidedJSFLibrary_PluginID();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion <em>JSF Version</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>JSF Version</em>'.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion
- * @generated
- */
- EEnum getJSFVersion();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- JSFLibraryRegistryFactory getJSFLibraryRegistryFactory();
-
-} //JSFLibraryRegistryPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java
deleted file mode 100644
index 1f77c4f29..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/JSFVersion.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>JSF Version</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getJSFVersion()
- * @model
- * @generated
- */
-public final class JSFVersion extends AbstractEnumerator {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The '<em><b>V1 1</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>V1 1</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #V1_1_LITERAL
- * @model name="v1_1"
- * @generated
- * @ordered
- */
- public static final int V1_1 = 1;
-
- /**
- * The '<em><b>V1 2</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>V1 2</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #V1_2_LITERAL
- * @model name="v1_2"
- * @generated
- * @ordered
- */
- public static final int V1_2 = 2;
-
- /**
- * The '<em><b>UNKNOWN</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>UNKNOWN</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #UNKNOWN_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int UNKNOWN = -1;
-
- /**
- * The '<em><b>V1 1</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #V1_1
- * @generated
- * @ordered
- */
- public static final JSFVersion V1_1_LITERAL = new JSFVersion(V1_1, "v1_1");
-
- /**
- * The '<em><b>V1 2</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #V1_2
- * @generated
- * @ordered
- */
- public static final JSFVersion V1_2_LITERAL = new JSFVersion(V1_2, "v1_2");
-
- /**
- * The '<em><b>UNKNOWN</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #UNKNOWN
- * @generated
- * @ordered
- */
- public static final JSFVersion UNKNOWN_LITERAL = new JSFVersion(UNKNOWN, "UNKNOWN");
-
- /**
- * An array of all the '<em><b>JSF Version</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final JSFVersion[] VALUES_ARRAY =
- new JSFVersion[] {
- V1_1_LITERAL,
- V1_2_LITERAL,
- UNKNOWN_LITERAL,
- };
-
- /**
- * A public read-only list of all the '<em><b>JSF Version</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>JSF Version</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JSFVersion get(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- JSFVersion result = VALUES_ARRAY[i];
- if (result.toString().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>JSF Version</b></em>' literal with the specified value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JSFVersion get(int value) {
- switch (value) {
- case V1_1: return V1_1_LITERAL;
- case V1_2: return V1_2_LITERAL;
- case UNKNOWN: return UNKNOWN_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private JSFVersion(int value, String name) {
- super(value, name);
- }
-
- /**
- * Returns the '<em><b>JSF Version</b></em>' literal with the specified
- * name like the get(String) method does, but will return UNKNOWN instead
- * of null if the name is not recognized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public static JSFVersion getJSFVersion(String name) {
- JSFVersion version = get(name);
- if (version == null) {
- version = UNKNOWN_LITERAL;
- }
- return version;
- }
-
-} //JSFVersion
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java
deleted file mode 100644
index 5474d9d1b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/PluginProvidedJSFLibrary.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Plugin Provided JSF Library</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary#getPluginID <em>Plugin ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getPluginProvidedJSFLibrary()
- * @model
- * @generated
- */
-public interface PluginProvidedJSFLibrary extends JSFLibrary{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Returns the value of the '<em><b>Plugin ID</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Plugin ID</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Plugin ID</em>' attribute.
- * @see #setPluginID(String)
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#getPluginProvidedJSFLibrary_PluginID()
- * @model required="true"
- * @generated
- */
- String getPluginID();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary#getPluginID <em>Plugin ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Plugin ID</em>' attribute.
- * @see #getPluginID()
- * @generated
- */
- void setPluginID(String value);
-
-} // PluginProvidedJSFLibrary
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java
deleted file mode 100644
index 0673b3887..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/adapter/MaintainDefaultImplementationAdapter.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-
-/**
- * EMF adapter that attempts to always maintain a default implementation
- * JSFLibrary upon addition and removal of JSFLibrary instances and upon
- * changing of a JSFLibrary instance's implementation property.
- *
- * @author Ian Trimble - Oracle
- */
-public class MaintainDefaultImplementationAdapter extends AdapterImpl {
-
- private static MaintainDefaultImplementationAdapter INSTANCE =
- new MaintainDefaultImplementationAdapter();
-
- /**
- * Gets the single instance of this adapter.
- *
- * @return The single instance of this adapter.
- */
- public static MaintainDefaultImplementationAdapter getInstance() {
- return INSTANCE;
- }
-
- /**
- * Called to notify this adapter that a change has occured.
- *
- * @param notification EMF Notification instance
- */
- public void notifyChanged(Notification notification) {
- Object objNotifier = notification.getNotifier();
- if (objNotifier instanceof JSFLibraryRegistry) {
- int eventType = notification.getEventType();
- switch (eventType) {
- case Notification.ADD:
- Object objNewValue = notification.getNewValue();
- if (objNewValue instanceof JSFLibrary) {
- libraryAdded((JSFLibrary)objNewValue);
- }
- break;
- case Notification.REMOVE:
- Object objOldValue = notification.getOldValue();
- if (objOldValue instanceof JSFLibrary) {
- libraryRemoved((JSFLibrary)objOldValue);
- }
- break;
- }
- } else if (objNotifier instanceof JSFLibrary) {
- if (notification.getFeatureID(JSFLibrary.class) == JSFLibraryRegistryPackage.JSF_LIBRARY__IMPLEMENTATION) {
- implementationFlagSet((JSFLibrary)objNotifier);
- }
- }
- }
-
- /**
- * Checks if the library added is an implementation and, if so, makes it
- * the default implementation if it is the only implementation.
- *
- * @param library JSFLibrary instance
- */
- protected void libraryAdded(JSFLibrary library) {
- if (library != null && library.isImplementation()) {
- JSFLibraryRegistry jsfLibReg = JSFCorePlugin.getDefault().getJSFLibraryRegistry();
- EList impls = jsfLibReg.getImplJSFLibraries();
- if (impls.size() == 1) {
- jsfLibReg.setDefaultImplementation(library);
- }
- }
- }
-
- /**
- * Checks if the library removed is the default implementation and, if so,
- * makes the first remaining implementation the new default or nulls out
- * the default implementation if no other implementation remains.
- *
- * @param library JSFLibrary instance
- */
- protected void libraryRemoved(JSFLibrary library) {
- if (library != null && library.isImplementation()) {
- JSFLibraryRegistry jsfLibReg = JSFCorePlugin.getDefault().getJSFLibraryRegistry();
- JSFLibrary defaultImpl = jsfLibReg.getDefaultImplementation();
- if (defaultImpl == null || library.getID().equals(defaultImpl.getID())) {
- setNewDefaultImplementation();
- }
- }
- }
-
- /**
- * Checks if the implementation flag of the JSFLibrary has been changed
- * such that it is now eligible to become the default implementation or
- * such that it is no longer eligible as the default implementation and
- * sets the default implementation appropriately. Note that the passed
- * JSFLibrary instance must have been added to the model before calling
- * this method for it to have any effect.
- *
- * @param library JSFLibrary instance
- */
- protected void implementationFlagSet(JSFLibrary library) {
- JSFLibraryRegistry jsfLibReg = JSFCorePlugin.getDefault().getJSFLibraryRegistry();
- if (jsfLibReg != null) {
- JSFLibrary defaultImpl = jsfLibReg.getDefaultImplementation();
- if (
- library.isImplementation() &&
- defaultImpl == null
- ) {
- jsfLibReg.setDefaultImplementation(library);
- } else if (
- !library.isImplementation() &&
- (defaultImpl != null && library.getID() == defaultImpl.getID())
- ) {
- setNewDefaultImplementation();
- }
- }
- }
-
- /**
- * Sets the first available JSFLibrary marked as an implementation as the
- * default implementation or sets the default implementation to null if no
- * JSFLibrary is marked as an implementation.
- */
- protected void setNewDefaultImplementation() {
- JSFLibraryRegistry jsfLibReg = JSFCorePlugin.getDefault().getJSFLibraryRegistry();
- EList impls = jsfLibReg.getImplJSFLibraries();
- if (impls.size() > 0) {
- jsfLibReg.setDefaultImplementation((JSFLibrary)impls.get(0));
- } else {
- jsfLibReg.setDefaultImplementation(null);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java
deleted file mode 100644
index 3a4348ff2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/ArchiveFileImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.Messages;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Archive File</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.ArchiveFileImpl#isRelativeToWorkspace <em>Relative To Workspace</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.ArchiveFileImpl#getSourceLocation <em>Source Location</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.ArchiveFileImpl#getRelativeDestLocation <em>Relative Dest Location</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.ArchiveFileImpl#getJSFLibrary <em>JSF Library</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ArchiveFileImpl extends EObjectImpl implements ArchiveFile {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The default value of the '{@link #isRelativeToWorkspace() <em>Relative To Workspace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isRelativeToWorkspace()
- * @generated
- * @ordered
- */
- protected static final boolean RELATIVE_TO_WORKSPACE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isRelativeToWorkspace() <em>Relative To Workspace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isRelativeToWorkspace()
- * @generated
- * @ordered
- */
- protected boolean relativeToWorkspace = RELATIVE_TO_WORKSPACE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSourceLocation() <em>Source Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceLocation()
- * @generated
- * @ordered
- */
- protected static final String SOURCE_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSourceLocation() <em>Source Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceLocation()
- * @generated
- * @ordered
- */
- protected String sourceLocation = SOURCE_LOCATION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getRelativeDestLocation() <em>Relative Dest Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRelativeDestLocation()
- * @generated
- * @ordered
- */
- protected static final String RELATIVE_DEST_LOCATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getRelativeDestLocation() <em>Relative Dest Location</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRelativeDestLocation()
- * @generated
- * @ordered
- */
- protected String relativeDestLocation = RELATIVE_DEST_LOCATION_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ArchiveFileImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JSFLibraryRegistryPackage.eINSTANCE.getArchiveFile();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSourceLocation() {
- return sourceLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * Enhanced to not only set the location but also to attempt to determine
- * if the location passed is relative to the current workspace. If so, only
- * the relative location is stored. If not, the full location as passed is
- * stored and the relativeToWorkspace property is set to false. To override
- * this behaviour and set the absolute location as passed regardless, call
- * setRelativeToWorkspace(false) BEFORE calling this method.
- *
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setSourceLocation(String newSourceLocation) {
- String oldSourceLocation = sourceLocation;
- if (relativeToWorkspace) {
- IWorkspaceRoot workspaceRoot = getWorkspaceRoot();
- if (workspaceRoot != null) {
- IPath wsRootPath = workspaceRoot.getLocation();
- IPath srcPath = new Path(newSourceLocation);
- if (workspaceRoot.findMember(srcPath) != null) {
- sourceLocation = newSourceLocation;
- } else if (wsRootPath.isPrefixOf(srcPath)) {
- int segmentsMatched = wsRootPath.matchingFirstSegments(srcPath);
- srcPath = srcPath.removeFirstSegments(segmentsMatched).setDevice(null);
- sourceLocation = srcPath.toOSString();
- } else {
- sourceLocation = newSourceLocation;
- relativeToWorkspace = false;
- }
- }
- } else {
- sourceLocation = newSourceLocation;
- }
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION, oldSourceLocation, sourceLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isRelativeToWorkspace() {
- return relativeToWorkspace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * To override workspace-relative recognition behaviour, be sure to call
- * this method with a false value BEFORE calling setLocation(String).
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRelativeToWorkspace(boolean newRelativeToWorkspace) {
- boolean oldRelativeToWorkspace = relativeToWorkspace;
- relativeToWorkspace = newRelativeToWorkspace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE, oldRelativeToWorkspace, relativeToWorkspace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getRelativeDestLocation() {
- return relativeDestLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRelativeDestLocation(String newRelativeDestLocation) {
- String oldRelativeDestLocation = relativeDestLocation;
- relativeDestLocation = newRelativeDestLocation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION, oldRelativeDestLocation, relativeDestLocation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibrary getJSFLibrary() {
- if (eContainerFeatureID != JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY) return null;
- return (JSFLibrary)eContainer;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJSFLibrary(JSFLibrary newJSFLibrary) {
- if (newJSFLibrary != eContainer || (eContainerFeatureID != JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY && newJSFLibrary != null)) {
- if (EcoreUtil.isAncestor(this, newJSFLibrary))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newJSFLibrary != null)
- msgs = ((InternalEObject)newJSFLibrary).eInverseAdd(this, JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES, JSFLibrary.class, msgs);
- msgs = eBasicSetContainer((InternalEObject)newJSFLibrary, JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY, newJSFLibrary, newJSFLibrary));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getPath() {
- String path = null;
- String resolvedSourceLocation = getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- int iPos = resolvedSourceLocation.lastIndexOf('/');
- if (iPos < 0) {
- iPos = resolvedSourceLocation.lastIndexOf('\\');
- }
- if (iPos < 1) {
- path = ""; //$NON-NLS-1$
- } else {
- path = resolvedSourceLocation.substring(0, iPos);
- }
- }
- return path;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getName() {
- String name = null;
- String resolvedSourceLocation = getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- int iPos = resolvedSourceLocation.lastIndexOf('/');
- if (iPos < 0) {
- iPos = resolvedSourceLocation.lastIndexOf('\\');
- }
- if (iPos < 0 || iPos == resolvedSourceLocation.length() - 1) {
- name = resolvedSourceLocation;
- } else {
- name = resolvedSourceLocation.substring(iPos + 1);
- }
- }
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean exists() {
- boolean exists = false;
- if (getJSFLibrary() instanceof PluginProvidedJSFLibrary) {
- Bundle bundle = getBundle();
- if (bundle != null) {
- exists = bundle.getEntry(sourceLocation) != null;
- }
- } else {
- String resolvedSourceLocation = getResolvedSourceLocation();
- if (resolvedSourceLocation != null) {
- exists = new File(resolvedSourceLocation).exists();
- }
- }
- return exists;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean equals(Object object) {
- boolean equal = false;
- if (object != null && object instanceof ArchiveFile) {
- String resolvedSourceLocation = getResolvedSourceLocation();
- String objResolvedSourceLocation = ((ArchiveFile)object).getResolvedSourceLocation();
- if (resolvedSourceLocation == null && objResolvedSourceLocation == null) {
- equal = true;
- } else if (resolvedSourceLocation != null) {
- equal = resolvedSourceLocation.equals(objResolvedSourceLocation);
- }
- }
- return equal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public int hashCode() {
- return getResolvedSourceLocation() != null ? getResolvedSourceLocation().hashCode() : 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean copyTo(String baseDestLocation) {
- boolean copied = false;
- InputStream in = null;
- OutputStream out = null;
- IPath outPath = new Path(baseDestLocation);
- if (relativeDestLocation != null) {
- outPath = outPath.append(relativeDestLocation);
- }
- outPath = outPath.append(getName());
- try {
- if (!outPath.toFile().exists()) {
- out = new FileOutputStream(outPath.toOSString());
- } else {
- return copied;
- }
- if (getJSFLibrary() instanceof PluginProvidedJSFLibrary) {
- Bundle bundle = getBundle();
- URL inURL = bundle.getEntry(sourceLocation);
- if (inURL != null) {
- in = inURL.openStream();
- } else {
- JSFCorePlugin.log(
- IStatus.ERROR,
- NLS.bind(Messages.ArchiveFileImpl_CannotLocatePluginRelativeFile,
- sourceLocation));
- return copied;
- }
- } else {
- in = new FileInputStream(getResolvedSourceLocation());
- }
- byte[] buf = new byte[1024];
- int len = 0;
- while ((len = in.read(buf)) > 0) {
- out.write(buf, 0, len);
- }
- copied = true;
- } catch(FileNotFoundException fnfe) {
- JSFCorePlugin.log(IStatus.ERROR, Messages.ArchiveFileImpl_CannotCopyFile, fnfe);
- } catch(IOException ioe) {
- JSFCorePlugin.log(IStatus.ERROR, Messages.ArchiveFileImpl_CannotCopyFile, ioe);
- } finally {
- try {
- if (in != null) {
- in.close();
- }
- if (out != null) {
- out.close();
- }
- } catch(IOException ioe) {
- JSFCorePlugin.log(IStatus.WARNING, Messages.ArchiveFileImpl_CannotCloseFile, ioe);
- }
- }
- return copied;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getResolvedSourceLocation() {
- String resolvedSourceLocation = null;
- /**
- * The implementation to support PluginProvidedJSFLibrary assume the following.
- * 1. Plugin provided JSF library needs to be distributed as an expanded folder.
- * 2. JARs for plugin provided JSF library need to reside inside the folder mentioned in item 1 above.
- * 3. Each JAR needs to specify a relative path for the folder mentioned in item 1 above.
- *
- * Fix for bug 144954.
- */
- if (getJSFLibrary() instanceof PluginProvidedJSFLibrary) {
- Bundle bundle = getBundle();
- if (bundle != null) {
- //resolvedSourceLocation = appendSeparator(bundleLocation) + sourceLocation;
- try {
- Path srcPath = new Path(sourceLocation);
- URL fileURL = Platform.find(bundle, srcPath);
- URL url = Platform.resolve(fileURL);
- resolvedSourceLocation = url.getPath();
- } catch (IOException e) {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- if (isRelativeToWorkspace()) {
- IWorkspaceRoot workspaceRoot = getWorkspaceRoot();
- if (workspaceRoot != null) {
- String workspaceLocation = workspaceRoot.getLocation().toOSString();
- if (workspaceLocation != null) {
- resolvedSourceLocation = appendSeparator(workspaceLocation) + sourceLocation;
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- } else {
- resolvedSourceLocation = sourceLocation;
- }
- }
- return resolvedSourceLocation;
- }
-
- /**
- * Gets the Bundle instance by parent PluginProvidedJSFLibrary instance's
- * pluginID property, if and only if the parent JSFLibrary instance IS a
- * PluginProvidedJSFLibrary, else returns null.
- * @return Bundle instance, or null if not located or applicable
- */
- protected Bundle getBundle() {
- Bundle bundle = null;
- if (getJSFLibrary() instanceof PluginProvidedJSFLibrary) {
- String pluginID = ((PluginProvidedJSFLibrary)getJSFLibrary()).getPluginID();
- if (pluginID != null) {
- bundle = Platform.getBundle(pluginID);
- }
- }
- return bundle;
- }
-
- /**
- * Gets the IWorkspaceRoot instance.
- * @return IWorkspaceRoot instance
- */
- protected IWorkspaceRoot getWorkspaceRoot() {
- IWorkspaceRoot workspaceRoot = null;
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- if (workspace != null) {
- workspaceRoot = workspace.getRoot();
- }
- return workspaceRoot;
- }
-
- protected String appendSeparator(String path) {
- String newPath = null;
- if (!path.endsWith("\\") && !path.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$
- newPath = path + System.getProperty("file.separator"); //$NON-NLS-1$
- } else {
- newPath = path;
- }
- return newPath;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- return eBasicSetContainer(null, JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- return eContainer.eInverseRemove(this, JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES, JSFLibrary.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- return isRelativeToWorkspace() ? Boolean.TRUE : Boolean.FALSE;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- return getSourceLocation();
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- return getRelativeDestLocation();
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- return getJSFLibrary();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- setRelativeToWorkspace(((Boolean)newValue).booleanValue());
- return;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- setSourceLocation((String)newValue);
- return;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- setRelativeDestLocation((String)newValue);
- return;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- setJSFLibrary((JSFLibrary)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- setRelativeToWorkspace(RELATIVE_TO_WORKSPACE_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- setSourceLocation(SOURCE_LOCATION_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- setRelativeDestLocation(RELATIVE_DEST_LOCATION_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- setJSFLibrary((JSFLibrary)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_TO_WORKSPACE:
- return relativeToWorkspace != RELATIVE_TO_WORKSPACE_EDEFAULT;
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__SOURCE_LOCATION:
- return SOURCE_LOCATION_EDEFAULT == null ? sourceLocation != null : !SOURCE_LOCATION_EDEFAULT.equals(sourceLocation);
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__RELATIVE_DEST_LOCATION:
- return RELATIVE_DEST_LOCATION_EDEFAULT == null ? relativeDestLocation != null : !RELATIVE_DEST_LOCATION_EDEFAULT.equals(relativeDestLocation);
- case JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY:
- return getJSFLibrary() != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (RelativeToWorkspace: ");
- result.append(relativeToWorkspace);
- result.append(", SourceLocation: ");
- result.append(sourceLocation);
- result.append(", RelativeDestLocation: ");
- result.append(relativeDestLocation);
- result.append(')');
- return result.toString();
- }
-
-} //ArchiveFileImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java
deleted file mode 100644
index 298656368..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java
+++ /dev/null
@@ -1,560 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter.MaintainDefaultImplementationAdapter;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JSF Library</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl#getID <em>ID</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl#getJSFVersion <em>JSF Version</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl#isDeployed <em>Deployed</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl#isImplementation <em>Implementation</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryImpl#getArchiveFiles <em>Archive Files</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JSFLibraryImpl extends EObjectImpl implements JSFLibrary {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The default value of the '{@link #getID() <em>ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getID()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getID()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJSFVersion() <em>JSF Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJSFVersion()
- * @generated
- * @ordered
- */
- protected static final JSFVersion JSF_VERSION_EDEFAULT = JSFVersion.UNKNOWN_LITERAL;
-
- /**
- * The cached value of the '{@link #getJSFVersion() <em>JSF Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJSFVersion()
- * @generated
- * @ordered
- */
- protected JSFVersion jsfVersion = JSF_VERSION_EDEFAULT;
-
- /**
- * The default value of the '{@link #isDeployed() <em>Deployed</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDeployed()
- * @generated
- * @ordered
- */
- protected static final boolean DEPLOYED_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isDeployed() <em>Deployed</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDeployed()
- * @generated
- * @ordered
- */
- protected boolean deployed = DEPLOYED_EDEFAULT;
-
- /**
- * The default value of the '{@link #isImplementation() <em>Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImplementation()
- * @generated
- * @ordered
- */
- protected static final boolean IMPLEMENTATION_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isImplementation() <em>Implementation</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImplementation()
- * @generated
- * @ordered
- */
- protected boolean implementation = IMPLEMENTATION_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getArchiveFiles() <em>Archive Files</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArchiveFiles()
- * @generated
- * @ordered
- */
- protected EList archiveFiles = null;
-
- /**
- * <!-- begin-user-doc -->
- * Enhanced to not only create an instance but also to set an initial ID
- * (which can be reset later) and to add the
- * MaintainDefaultImplementationAdapter to the list of adapters.
- * <!-- end-user-doc -->
- * @generated NOT
- */
- protected JSFLibraryImpl() {
- super();
- //set initial ID; will be overwritten from XML if already persisted
- setID(String.valueOf(System.currentTimeMillis()));
- //add adapter to maintain a default implementation
- eAdapters().add(MaintainDefaultImplementationAdapter.getInstance());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JSFLibraryRegistryPackage.eINSTANCE.getJSFLibrary();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getID() {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setID(String newID) {
- String oldID = id;
- id = newID;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.JSF_LIBRARY__ID, oldID, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.JSF_LIBRARY__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFVersion getJSFVersion() {
- return jsfVersion;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJSFVersion(JSFVersion newJSFVersion) {
- JSFVersion oldJSFVersion = jsfVersion;
- jsfVersion = newJSFVersion == null ? JSF_VERSION_EDEFAULT : newJSFVersion;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.JSF_LIBRARY__JSF_VERSION, oldJSFVersion, jsfVersion));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isDeployed() {
- return deployed;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDeployed(boolean newDeployed) {
- boolean oldDeployed = deployed;
- deployed = newDeployed;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.JSF_LIBRARY__DEPLOYED, oldDeployed, deployed));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isImplementation() {
- return implementation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImplementation(boolean newImplementation) {
- boolean oldImplementation = implementation;
- implementation = newImplementation;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.JSF_LIBRARY__IMPLEMENTATION, oldImplementation, implementation));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getArchiveFiles() {
- if (archiveFiles == null) {
- archiveFiles = new EObjectContainmentWithInverseEList(ArchiveFile.class, this, JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES, JSFLibraryRegistryPackage.ARCHIVE_FILE__JSF_LIBRARY);
- }
- return archiveFiles;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean containsArchiveFile(String fullPath) {
- boolean contains = false;
- if (fullPath != null) {
- Iterator itArchiveFiles = getArchiveFiles().iterator();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile archiveFile = (ArchiveFile)itArchiveFiles.next();
- if (fullPath.equals(archiveFile.getResolvedSourceLocation())) {
- contains = true;
- break;
- }
- }
- }
- return contains;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public JSFLibrary getWorkingCopy() {
- JSFLibrary workingCopyLib = JSFLibraryRegistryFactory.eINSTANCE.createJSFLibrary();
- workingCopyLib.setID(getID());
- workingCopyLib.setName(getName());
- workingCopyLib.setJSFVersion(getJSFVersion());
- workingCopyLib.setDeployed(isDeployed());
- workingCopyLib.setImplementation(isImplementation());
- Iterator itArchiveFiles = getArchiveFiles().iterator();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile srcArchiveFile = (ArchiveFile)itArchiveFiles.next();
- ArchiveFile destArchiveFile = JSFLibraryRegistryFactory.eINSTANCE.createArchiveFile();
- destArchiveFile.setRelativeToWorkspace(srcArchiveFile.isRelativeToWorkspace());
- destArchiveFile.setSourceLocation(srcArchiveFile.getSourceLocation());
- destArchiveFile.setRelativeDestLocation(srcArchiveFile.getRelativeDestLocation());
- workingCopyLib.getArchiveFiles().add(destArchiveFile);
- }
- return workingCopyLib;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void updateValues(JSFLibrary otherLibrary) {
- if (otherLibrary != null) {
- setID(otherLibrary.getID());
- setName(otherLibrary.getName());
- setJSFVersion(otherLibrary.getJSFVersion());
- setDeployed(otherLibrary.isDeployed());
- setImplementation(otherLibrary.isImplementation());
- Iterator itArchiveFiles = otherLibrary.getArchiveFiles().iterator();
- getArchiveFiles().clear();
- while (itArchiveFiles.hasNext()) {
- ArchiveFile srcArchiveFile = (ArchiveFile)itArchiveFiles.next();
- ArchiveFile destArchiveFile = JSFLibraryRegistryFactory.eINSTANCE.createArchiveFile();
- destArchiveFile.setRelativeToWorkspace(srcArchiveFile.isRelativeToWorkspace());
- destArchiveFile.setSourceLocation(srcArchiveFile.getSourceLocation());
- destArchiveFile.setRelativeDestLocation(srcArchiveFile.getRelativeDestLocation());
- getArchiveFiles().add(destArchiveFile);
- }
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean copyTo(String baseDestLocation) {
- boolean allCopied = true;
- Iterator itFiles = getArchiveFiles().iterator();
- while (itFiles.hasNext()) {
- ArchiveFile archiveFile = (ArchiveFile)itFiles.next();
- boolean copied = archiveFile.copyTo(baseDestLocation);
- allCopied = allCopied && copied;
- }
- return allCopied;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES:
- return ((InternalEList)getArchiveFiles()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES:
- return ((InternalEList)getArchiveFiles()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ID:
- return getID();
- case JSFLibraryRegistryPackage.JSF_LIBRARY__NAME:
- return getName();
- case JSFLibraryRegistryPackage.JSF_LIBRARY__JSF_VERSION:
- return getJSFVersion();
- case JSFLibraryRegistryPackage.JSF_LIBRARY__DEPLOYED:
- return isDeployed() ? Boolean.TRUE : Boolean.FALSE;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__IMPLEMENTATION:
- return isImplementation() ? Boolean.TRUE : Boolean.FALSE;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES:
- return getArchiveFiles();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ID:
- setID((String)newValue);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__NAME:
- setName((String)newValue);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__JSF_VERSION:
- setJSFVersion((JSFVersion)newValue);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__DEPLOYED:
- setDeployed(((Boolean)newValue).booleanValue());
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__IMPLEMENTATION:
- setImplementation(((Boolean)newValue).booleanValue());
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES:
- getArchiveFiles().clear();
- getArchiveFiles().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ID:
- setID(ID_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__NAME:
- setName(NAME_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__JSF_VERSION:
- setJSFVersion(JSF_VERSION_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__DEPLOYED:
- setDeployed(DEPLOYED_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__IMPLEMENTATION:
- setImplementation(IMPLEMENTATION_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES:
- getArchiveFiles().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case JSFLibraryRegistryPackage.JSF_LIBRARY__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case JSFLibraryRegistryPackage.JSF_LIBRARY__JSF_VERSION:
- return jsfVersion != JSF_VERSION_EDEFAULT;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__DEPLOYED:
- return deployed != DEPLOYED_EDEFAULT;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__IMPLEMENTATION:
- return implementation != IMPLEMENTATION_EDEFAULT;
- case JSFLibraryRegistryPackage.JSF_LIBRARY__ARCHIVE_FILES:
- return archiveFiles != null && !archiveFiles.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (ID: ");
- result.append(id);
- result.append(", Name: ");
- result.append(name);
- result.append(", JSFVersion: ");
- result.append(jsfVersion);
- result.append(", Deployed: ");
- result.append(deployed);
- result.append(", Implementation: ");
- result.append(implementation);
- result.append(')');
- return result.toString();
- }
-
-} //JSFLibraryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java
deleted file mode 100644
index d7ce56ef5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLibraryRegistryFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistryFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY: return createJSFLibraryRegistry();
- case JSFLibraryRegistryPackage.JSF_LIBRARY: return createJSFLibrary();
- case JSFLibraryRegistryPackage.ARCHIVE_FILE: return createArchiveFile();
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY: return createPluginProvidedJSFLibrary();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case JSFLibraryRegistryPackage.JSF_VERSION: {
- JSFVersion result = JSFVersion.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case JSFLibraryRegistryPackage.JSF_VERSION:
- return instanceValue == null ? null : instanceValue.toString();
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistry createJSFLibraryRegistry() {
- JSFLibraryRegistryImpl jsfLibraryRegistry = new JSFLibraryRegistryImpl();
- return jsfLibraryRegistry;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibrary createJSFLibrary() {
- JSFLibraryImpl jsfLibrary = new JSFLibraryImpl();
- return jsfLibrary;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ArchiveFile createArchiveFile() {
- ArchiveFileImpl archiveFile = new ArchiveFileImpl();
- return archiveFile;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PluginProvidedJSFLibrary createPluginProvidedJSFLibrary() {
- PluginProvidedJSFLibraryImpl pluginProvidedJSFLibrary = new PluginProvidedJSFLibraryImpl();
- return pluginProvidedJSFLibrary;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistryPackage getJSFLibraryRegistryPackage() {
- return (JSFLibraryRegistryPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static JSFLibraryRegistryPackage getPackage() {
- return JSFLibraryRegistryPackage.eINSTANCE;
- }
-
-} //JSFLibraryRegistryFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java
deleted file mode 100644
index f460618d6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JSF Library Registry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryImpl#getDefaultImplementationID <em>Default Implementation ID</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryImpl#getJSFLibraries <em>JSF Libraries</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegistryImpl#getPluginProvidedJSFLibraries <em>Plugin Provided JSF Libraries</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JSFLibraryRegistryImpl extends EObjectImpl implements JSFLibraryRegistry {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The default value of the '{@link #getDefaultImplementationID() <em>Default Implementation ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDefaultImplementationID()
- * @generated
- * @ordered
- */
- protected static final String DEFAULT_IMPLEMENTATION_ID_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getDefaultImplementationID() <em>Default Implementation ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDefaultImplementationID()
- * @generated
- * @ordered
- */
- protected String defaultImplementationID = DEFAULT_IMPLEMENTATION_ID_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getJSFLibraries() <em>JSF Libraries</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJSFLibraries()
- * @generated
- * @ordered
- */
- protected EList jsfLibraries = null;
-
- /**
- * The cached value of the '{@link #getPluginProvidedJSFLibraries() <em>Plugin Provided JSF Libraries</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPluginProvidedJSFLibraries()
- * @generated
- * @ordered
- */
- protected EList pluginProvidedJSFLibraries = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected JSFLibraryRegistryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JSFLibraryRegistryPackage.eINSTANCE.getJSFLibraryRegistry();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDefaultImplementationID() {
- return defaultImplementationID;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDefaultImplementationID(String newDefaultImplementationID) {
- String oldDefaultImplementationID = defaultImplementationID;
- defaultImplementationID = newDefaultImplementationID;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID, oldDefaultImplementationID, defaultImplementationID));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getJSFLibraries() {
- if (jsfLibraries == null) {
- jsfLibraries = new EObjectContainmentEList(JSFLibrary.class, this, JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__JSF_LIBRARIES);
- }
- return jsfLibraries;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getPluginProvidedJSFLibraries() {
- if (pluginProvidedJSFLibraries == null) {
- pluginProvidedJSFLibraries = new EObjectContainmentEList(PluginProvidedJSFLibrary.class, this, JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES);
- }
- return pluginProvidedJSFLibraries;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public JSFLibrary getDefaultImplementation() {
- return getJSFLibraryByID(getDefaultImplementationID());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setDefaultImplementation(JSFLibrary implementation) {
- if (implementation != null) {
- setDefaultImplementationID(implementation.getID());
- } else {
- setDefaultImplementationID(null);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public JSFLibrary getJSFLibraryByID(String ID) {
- JSFLibrary library = null;
- if (ID != null) {
- Iterator itLibs = getAllJSFLibraries().iterator();
- while (itLibs.hasNext()) {
- JSFLibrary curLib = (JSFLibrary)itLibs.next();
- if (ID.equals(curLib.getID())) {
- library = curLib;
- break;
- }
- }
- }
- return library;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getJSFLibrariesByName(String name) {
- EList libraries = new BasicEList();
- if (name != null) {
- Iterator itLibs = getAllJSFLibraries().iterator();
- while(itLibs.hasNext()) {
- JSFLibrary curLib = (JSFLibrary)itLibs.next();
- if (name.equals(curLib.getName())) {
- libraries.add(curLib);
- }
- }
- }
- return libraries;
- }
-
- /**
- * <!-- begin-user-doc -->
- * This is a convenience method to return an EList of JSFLibrary instances
- * that are marked as JSF implementations; while all instances are valid
- * references, the returned EList should not be used for additions and/or
- * removals of instances (use the EList returned by getJSFLibraries()).
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getImplJSFLibraries() {
- EList implementations = new BasicEList();
- Iterator itLibs = getAllJSFLibraries().iterator();
- while (itLibs.hasNext()) {
- JSFLibrary lib = (JSFLibrary)itLibs.next();
- if (lib.isImplementation()) {
- implementations.add(lib);
- }
- }
- return implementations;
- }
-
- /**
- * <!-- begin-user-doc -->
- * This is a convenience method to return an EList of JSFLibrary instances
- * that are not marked as JSF implementations; while all instances are
- * valid references, the returned EList should not be used for additions
- * and/or removals of instances (use the EList returned by
- * getJSFLibraries()).
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getNonImplJSFLibraries() {
- EList nonImplementations = new BasicEList();
- Iterator itLibs = getAllJSFLibraries().iterator();
- while (itLibs.hasNext()) {
- JSFLibrary lib = (JSFLibrary)itLibs.next();
- if (!lib.isImplementation()) {
- nonImplementations.add(lib);
- }
- }
- return nonImplementations;
- }
-
- /**
- * <!-- begin-user-doc -->
- * This is a convenience method to return an EList of JSFLibrary instances
- * and PluginProvidedJSFLibrary instances; while all instances are valid
- * references, the returned EList should not be used for additions and/or
- * removals of instances (use the EList returned by getJSFLibraries()).
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getAllJSFLibraries() {
- EList allLibs = new BasicEList();
- allLibs.addAll(getJSFLibraries());
- allLibs.addAll(getPluginProvidedJSFLibraries());
- return allLibs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean addJSFLibrary(JSFLibrary library) {
- boolean added = false;
- if (library instanceof PluginProvidedJSFLibrary) {
- added = getPluginProvidedJSFLibraries().add(library);
- } else {
- added = getJSFLibraries().add(library);
- }
- return added;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean removeJSFLibrary(JSFLibrary library) {
- boolean removed = false;
- if (library instanceof PluginProvidedJSFLibrary) {
- removed = getPluginProvidedJSFLibraries().remove(library);
- } else {
- removed = getJSFLibraries().remove(library);
- }
- return removed;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__JSF_LIBRARIES:
- return ((InternalEList)getJSFLibraries()).basicRemove(otherEnd, msgs);
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES:
- return ((InternalEList)getPluginProvidedJSFLibraries()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- return getDefaultImplementationID();
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__JSF_LIBRARIES:
- return getJSFLibraries();
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES:
- return getPluginProvidedJSFLibraries();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- setDefaultImplementationID((String)newValue);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__JSF_LIBRARIES:
- getJSFLibraries().clear();
- getJSFLibraries().addAll((Collection)newValue);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES:
- getPluginProvidedJSFLibraries().clear();
- getPluginProvidedJSFLibraries().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- setDefaultImplementationID(DEFAULT_IMPLEMENTATION_ID_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__JSF_LIBRARIES:
- getJSFLibraries().clear();
- return;
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES:
- getPluginProvidedJSFLibraries().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID:
- return DEFAULT_IMPLEMENTATION_ID_EDEFAULT == null ? defaultImplementationID != null : !DEFAULT_IMPLEMENTATION_ID_EDEFAULT.equals(defaultImplementationID);
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__JSF_LIBRARIES:
- return jsfLibraries != null && !jsfLibraries.isEmpty();
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES:
- return pluginProvidedJSFLibraries != null && !pluginProvidedJSFLibraries.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (DefaultImplementationID: ");
- result.append(defaultImplementationID);
- result.append(')');
- return result.toString();
- }
-
-} //JSFLibraryRegistryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java
deleted file mode 100644
index 6d496c92c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryPackageImpl.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JSFLibraryRegistryPackageImpl extends EPackageImpl implements JSFLibraryRegistryPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass jsfLibraryRegistryEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass jsfLibraryEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass archiveFileEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass pluginProvidedJSFLibraryEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum jsfVersionEEnum = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private JSFLibraryRegistryPackageImpl() {
- super(eNS_URI, JSFLibraryRegistryFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static JSFLibraryRegistryPackage init() {
- if (isInited) return (JSFLibraryRegistryPackage)EPackage.Registry.INSTANCE.getEPackage(JSFLibraryRegistryPackage.eNS_URI);
-
- // Obtain or create and register package
- JSFLibraryRegistryPackageImpl theJSFLibraryRegistryPackage = (JSFLibraryRegistryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JSFLibraryRegistryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JSFLibraryRegistryPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theJSFLibraryRegistryPackage.createPackageContents();
-
- // Initialize created meta-data
- theJSFLibraryRegistryPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theJSFLibraryRegistryPackage.freeze();
-
- return theJSFLibraryRegistryPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getJSFLibraryRegistry() {
- return jsfLibraryRegistryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJSFLibraryRegistry_DefaultImplementationID() {
- return (EAttribute)jsfLibraryRegistryEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getJSFLibraryRegistry_JSFLibraries() {
- return (EReference)jsfLibraryRegistryEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getJSFLibraryRegistry_PluginProvidedJSFLibraries() {
- return (EReference)jsfLibraryRegistryEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getJSFLibrary() {
- return jsfLibraryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJSFLibrary_ID() {
- return (EAttribute)jsfLibraryEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJSFLibrary_Name() {
- return (EAttribute)jsfLibraryEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJSFLibrary_JSFVersion() {
- return (EAttribute)jsfLibraryEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJSFLibrary_Deployed() {
- return (EAttribute)jsfLibraryEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJSFLibrary_Implementation() {
- return (EAttribute)jsfLibraryEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getJSFLibrary_ArchiveFiles() {
- return (EReference)jsfLibraryEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getArchiveFile() {
- return archiveFileEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getArchiveFile_SourceLocation() {
- return (EAttribute)archiveFileEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getArchiveFile_RelativeToWorkspace() {
- return (EAttribute)archiveFileEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getArchiveFile_RelativeDestLocation() {
- return (EAttribute)archiveFileEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getArchiveFile_JSFLibrary() {
- return (EReference)archiveFileEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPluginProvidedJSFLibrary() {
- return pluginProvidedJSFLibraryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPluginProvidedJSFLibrary_PluginID() {
- return (EAttribute)pluginProvidedJSFLibraryEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getJSFVersion() {
- return jsfVersionEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistryFactory getJSFLibraryRegistryFactory() {
- return (JSFLibraryRegistryFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- jsfLibraryRegistryEClass = createEClass(JSF_LIBRARY_REGISTRY);
- createEAttribute(jsfLibraryRegistryEClass, JSF_LIBRARY_REGISTRY__DEFAULT_IMPLEMENTATION_ID);
- createEReference(jsfLibraryRegistryEClass, JSF_LIBRARY_REGISTRY__JSF_LIBRARIES);
- createEReference(jsfLibraryRegistryEClass, JSF_LIBRARY_REGISTRY__PLUGIN_PROVIDED_JSF_LIBRARIES);
-
- jsfLibraryEClass = createEClass(JSF_LIBRARY);
- createEAttribute(jsfLibraryEClass, JSF_LIBRARY__ID);
- createEAttribute(jsfLibraryEClass, JSF_LIBRARY__NAME);
- createEAttribute(jsfLibraryEClass, JSF_LIBRARY__JSF_VERSION);
- createEAttribute(jsfLibraryEClass, JSF_LIBRARY__DEPLOYED);
- createEAttribute(jsfLibraryEClass, JSF_LIBRARY__IMPLEMENTATION);
- createEReference(jsfLibraryEClass, JSF_LIBRARY__ARCHIVE_FILES);
-
- archiveFileEClass = createEClass(ARCHIVE_FILE);
- createEAttribute(archiveFileEClass, ARCHIVE_FILE__RELATIVE_TO_WORKSPACE);
- createEAttribute(archiveFileEClass, ARCHIVE_FILE__SOURCE_LOCATION);
- createEAttribute(archiveFileEClass, ARCHIVE_FILE__RELATIVE_DEST_LOCATION);
- createEReference(archiveFileEClass, ARCHIVE_FILE__JSF_LIBRARY);
-
- pluginProvidedJSFLibraryEClass = createEClass(PLUGIN_PROVIDED_JSF_LIBRARY);
- createEAttribute(pluginProvidedJSFLibraryEClass, PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID);
-
- // Create enums
- jsfVersionEEnum = createEEnum(JSF_VERSION);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Add supertypes to classes
- pluginProvidedJSFLibraryEClass.getESuperTypes().add(this.getJSFLibrary());
-
- // Initialize classes and features; add operations and parameters
- initEClass(jsfLibraryRegistryEClass, JSFLibraryRegistry.class, "JSFLibraryRegistry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJSFLibraryRegistry_DefaultImplementationID(), ecorePackage.getEString(), "DefaultImplementationID", "", 0, 1, JSFLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJSFLibraryRegistry_JSFLibraries(), this.getJSFLibrary(), null, "JSFLibraries", null, 0, -1, JSFLibraryRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJSFLibraryRegistry_PluginProvidedJSFLibraries(), this.getPluginProvidedJSFLibrary(), null, "PluginProvidedJSFLibraries", null, 0, -1, JSFLibraryRegistry.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getImplJSFLibraries");
-
- addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getNonImplJSFLibraries");
-
- EOperation op = addEOperation(jsfLibraryRegistryEClass, this.getJSFLibrary(), "getJSFLibraryByID");
- addEParameter(op, ecorePackage.getEString(), "ID");
-
- op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getJSFLibrariesByName");
- addEParameter(op, ecorePackage.getEString(), "name");
-
- addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEEList(), "getAllJSFLibraries");
-
- op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEBoolean(), "addJSFLibrary");
- addEParameter(op, this.getJSFLibrary(), "library");
-
- op = addEOperation(jsfLibraryRegistryEClass, ecorePackage.getEBoolean(), "removeJSFLibrary");
- addEParameter(op, this.getJSFLibrary(), "library");
-
- addEOperation(jsfLibraryRegistryEClass, this.getJSFLibrary(), "getDefaultImplementation");
-
- op = addEOperation(jsfLibraryRegistryEClass, null, "setDefaultImplementation");
- addEParameter(op, this.getJSFLibrary(), "implementation");
-
- initEClass(jsfLibraryEClass, JSFLibrary.class, "JSFLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJSFLibrary_ID(), ecorePackage.getEString(), "ID", "", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJSFLibrary_Name(), ecorePackage.getEString(), "Name", null, 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJSFLibrary_JSFVersion(), this.getJSFVersion(), "JSFVersion", "UNKNOWN", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJSFLibrary_Deployed(), ecorePackage.getEBoolean(), "Deployed", "true", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJSFLibrary_Implementation(), ecorePackage.getEBoolean(), "Implementation", "false", 1, 1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJSFLibrary_ArchiveFiles(), this.getArchiveFile(), this.getArchiveFile_JSFLibrary(), "ArchiveFiles", null, 0, -1, JSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(jsfLibraryEClass, ecorePackage.getEBoolean(), "containsArchiveFile");
- addEParameter(op, ecorePackage.getEString(), "fullPath");
-
- addEOperation(jsfLibraryEClass, this.getJSFLibrary(), "getWorkingCopy");
-
- op = addEOperation(jsfLibraryEClass, null, "updateValues");
- addEParameter(op, this.getJSFLibrary(), "otherLibrary");
-
- op = addEOperation(jsfLibraryEClass, ecorePackage.getEBoolean(), "copyTo");
- addEParameter(op, ecorePackage.getEString(), "baseDestLocation");
-
- initEClass(archiveFileEClass, ArchiveFile.class, "ArchiveFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getArchiveFile_RelativeToWorkspace(), ecorePackage.getEBoolean(), "RelativeToWorkspace", "true", 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getArchiveFile_SourceLocation(), ecorePackage.getEString(), "SourceLocation", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getArchiveFile_RelativeDestLocation(), ecorePackage.getEString(), "RelativeDestLocation", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getArchiveFile_JSFLibrary(), this.getJSFLibrary(), this.getJSFLibrary_ArchiveFiles(), "JSFLibrary", null, 1, 1, ArchiveFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(archiveFileEClass, ecorePackage.getEString(), "getName");
-
- addEOperation(archiveFileEClass, ecorePackage.getEString(), "getPath");
-
- addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "exists");
-
- op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "equals");
- addEParameter(op, ecorePackage.getEJavaObject(), "object");
-
- addEOperation(archiveFileEClass, ecorePackage.getEInt(), "hashCode");
-
- op = addEOperation(archiveFileEClass, ecorePackage.getEBoolean(), "copyTo");
- addEParameter(op, ecorePackage.getEString(), "baseDestLocation");
-
- addEOperation(archiveFileEClass, ecorePackage.getEString(), "getResolvedSourceLocation");
-
- initEClass(pluginProvidedJSFLibraryEClass, PluginProvidedJSFLibrary.class, "PluginProvidedJSFLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPluginProvidedJSFLibrary_PluginID(), ecorePackage.getEString(), "pluginID", null, 1, 1, PluginProvidedJSFLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Initialize enums and add enum literals
- initEEnum(jsfVersionEEnum, JSFVersion.class, "JSFVersion");
- addEEnumLiteral(jsfVersionEEnum, JSFVersion.V1_1_LITERAL);
- addEEnumLiteral(jsfVersionEEnum, JSFVersion.V1_2_LITERAL);
- addEEnumLiteral(jsfVersionEEnum, JSFVersion.UNKNOWN_LITERAL);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //JSFLibraryRegistryPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java
deleted file mode 100644
index c474714ff..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/PluginProvidedJSFLibraryImpl.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Plugin Provided JSF Library</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.PluginProvidedJSFLibraryImpl#getPluginID <em>Plugin ID</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PluginProvidedJSFLibraryImpl extends JSFLibraryImpl implements PluginProvidedJSFLibrary {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The default value of the '{@link #getPluginID() <em>Plugin ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPluginID()
- * @generated
- * @ordered
- */
- protected static final String PLUGIN_ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getPluginID() <em>Plugin ID</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPluginID()
- * @generated
- * @ordered
- */
- protected String pluginID = PLUGIN_ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PluginProvidedJSFLibraryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JSFLibraryRegistryPackage.eINSTANCE.getPluginProvidedJSFLibrary();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getPluginID() {
- return pluginID;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPluginID(String newPluginID) {
- String oldPluginID = pluginID;
- pluginID = newPluginID;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID, oldPluginID, pluginID));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES:
- return ((InternalEList)getArchiveFiles()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES:
- return ((InternalEList)getArchiveFiles()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ID:
- return getID();
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__NAME:
- return getName();
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__JSF_VERSION:
- return getJSFVersion();
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__DEPLOYED:
- return isDeployed() ? Boolean.TRUE : Boolean.FALSE;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__IMPLEMENTATION:
- return isImplementation() ? Boolean.TRUE : Boolean.FALSE;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES:
- return getArchiveFiles();
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID:
- return getPluginID();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ID:
- setID((String)newValue);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__NAME:
- setName((String)newValue);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__JSF_VERSION:
- setJSFVersion((JSFVersion)newValue);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__DEPLOYED:
- setDeployed(((Boolean)newValue).booleanValue());
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__IMPLEMENTATION:
- setImplementation(((Boolean)newValue).booleanValue());
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES:
- getArchiveFiles().clear();
- getArchiveFiles().addAll((Collection)newValue);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID:
- setPluginID((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ID:
- setID(ID_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__NAME:
- setName(NAME_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__JSF_VERSION:
- setJSFVersion(JSF_VERSION_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__DEPLOYED:
- setDeployed(DEPLOYED_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__IMPLEMENTATION:
- setImplementation(IMPLEMENTATION_EDEFAULT);
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES:
- getArchiveFiles().clear();
- return;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID:
- setPluginID(PLUGIN_ID_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__JSF_VERSION:
- return jsfVersion != JSF_VERSION_EDEFAULT;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__DEPLOYED:
- return deployed != DEPLOYED_EDEFAULT;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__IMPLEMENTATION:
- return implementation != IMPLEMENTATION_EDEFAULT;
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__ARCHIVE_FILES:
- return archiveFiles != null && !archiveFiles.isEmpty();
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY__PLUGIN_ID:
- return PLUGIN_ID_EDEFAULT == null ? pluginID != null : !PLUGIN_ID_EDEFAULT.equals(pluginID);
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (pluginID: ");
- result.append(pluginID);
- result.append(')');
- return result.toString();
- }
-
-} //PluginProvidedJSFLibraryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java
deleted file mode 100644
index 4002101e2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryAdapterFactory.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage
- * @generated
- */
-public class JSFLibraryRegistryAdapterFactory extends AdapterFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static JSFLibraryRegistryPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistryAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = JSFLibraryRegistryPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected JSFLibraryRegistrySwitch modelSwitch =
- new JSFLibraryRegistrySwitch() {
- public Object caseJSFLibraryRegistry(JSFLibraryRegistry object) {
- return createJSFLibraryRegistryAdapter();
- }
- public Object caseJSFLibrary(JSFLibrary object) {
- return createJSFLibraryAdapter();
- }
- public Object caseArchiveFile(ArchiveFile object) {
- return createArchiveFileAdapter();
- }
- public Object casePluginProvidedJSFLibrary(PluginProvidedJSFLibrary object) {
- return createPluginProvidedJSFLibraryAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry <em>JSF Library Registry</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry
- * @generated
- */
- public Adapter createJSFLibraryRegistryAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary <em>JSF Library</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary
- * @generated
- */
- public Adapter createJSFLibraryAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile <em>Archive File</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile
- * @generated
- */
- public Adapter createArchiveFileAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary <em>Plugin Provided JSF Library</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary
- * @generated
- */
- public Adapter createPluginProvidedJSFLibraryAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //JSFLibraryRegistryAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java
deleted file mode 100644
index e369138b1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceFactoryImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceImpl
- * @generated
- */
-public class JSFLibraryRegistryResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Creates an instance of the resource factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistryResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Resource createResource(URI uri) {
- Resource result = new JSFLibraryRegistryResourceImpl(uri);
- return result;
- }
-
-} //JSFLibraryRegistryResourceFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java
deleted file mode 100644
index 5d67dcfac..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryResourceImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceFactoryImpl
- * @generated
- */
-public class JSFLibraryRegistryResourceImpl extends XMLResourceImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
- */
- public JSFLibraryRegistryResourceImpl(URI uri) {
- super(uri);
- }
-
-} //JSFLibraryRegistryResourceImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java
deleted file mode 100644
index 58863bf42..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistrySwitch.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage
- * @generated
- */
-public class JSFLibraryRegistrySwitch {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2005 Oracle Corporation";
-
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static JSFLibraryRegistryPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JSFLibraryRegistrySwitch() {
- if (modelPackage == null) {
- modelPackage = JSFLibraryRegistryPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case JSFLibraryRegistryPackage.JSF_LIBRARY_REGISTRY: {
- JSFLibraryRegistry jsfLibraryRegistry = (JSFLibraryRegistry)theEObject;
- Object result = caseJSFLibraryRegistry(jsfLibraryRegistry);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JSFLibraryRegistryPackage.JSF_LIBRARY: {
- JSFLibrary jsfLibrary = (JSFLibrary)theEObject;
- Object result = caseJSFLibrary(jsfLibrary);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JSFLibraryRegistryPackage.ARCHIVE_FILE: {
- ArchiveFile archiveFile = (ArchiveFile)theEObject;
- Object result = caseArchiveFile(archiveFile);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JSFLibraryRegistryPackage.PLUGIN_PROVIDED_JSF_LIBRARY: {
- PluginProvidedJSFLibrary pluginProvidedJSFLibrary = (PluginProvidedJSFLibrary)theEObject;
- Object result = casePluginProvidedJSFLibrary(pluginProvidedJSFLibrary);
- if (result == null) result = caseJSFLibrary(pluginProvidedJSFLibrary);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>JSF Library Registry</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>JSF Library Registry</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJSFLibraryRegistry(JSFLibraryRegistry object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>JSF Library</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>JSF Library</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJSFLibrary(JSFLibrary object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Archive File</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Archive File</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseArchiveFile(ArchiveFile object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Plugin Provided JSF Library</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Plugin Provided JSF Library</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePluginProvidedJSFLibrary(PluginProvidedJSFLibrary object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //JSFLibraryRegistrySwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java
deleted file mode 100644
index 31fae2ef5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/launch/JSFFileURL.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.launch;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.core.internal.project.facet.JSFUtils;
-
-/**
- * Extends the FileURL extension-point so that a JSF JSP page
- * can have it's URL mapped to the Faces Servlet using the servlet-mapping
- * specified in the web.xml file
- *
- * @author Gerry Kessler - Oracle
- *
- */
-public class JSFFileURL implements FileURL {
-
- /**
- * If this is a JSP page, this will return a URL using the first valid servlet-mapping to the Faces Servlet
- * if found. If the faces servlet is not defined in the web.xml or there is no servlet-mapping, this will return null.
- *
- * Currently (11/21/05) this will only work if file extension is .jsf
- *
- * @see org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL#getFileURL(org.eclipse.core.resources.IResource, org.eclipse.core.runtime.IPath)
- */
- public IPath getFileURL(IResource resource, IPath existingURL) {
- WebArtifactEdit webAppEdit = null;
-
- //temporarily, we will filter on jsp file extensions only.
- if (!resource.getFileExtension().equalsIgnoreCase("jsp")) //$NON-NLS-1$
- return null;
-
- try {
- //is this is a Faces Project with a Faces Servlet?
- //we will not check to see if facet is installed.
- // check to see if this resource is a JSF page (currently always true) and then,
- //if servlet is present, we will change the url based on first mapping found
- webAppEdit = JSFUtils.getWebArtifactEditForRead(resource.getProject());
- if (webAppEdit != null){
- WebApp webApp = webAppEdit.getWebApp();
- if (webApp != null){
- Servlet servlet = JSFUtils.findJSFServlet(webAppEdit.getWebApp());
- if (servlet == null)//if no faces servlet, do nothing
- return null;
-
- //if not a JSF page, do nothing
- if (!isJSFPage(resource))
- return null;
-
- Iterator mappings = servlet.getMappings().iterator();
- ServletMapping map = null;
- while (mappings.hasNext()){
- map = (ServletMapping)mappings.next();
-
- String foundFileExtension = getFileExtensionFromMap(map);
- if (foundFileExtension != null)
- return existingURL.removeFileExtension().addFileExtension(foundFileExtension);
-
- String foundDirectoryMapping = getDirectoryMapping(map);
- if (foundDirectoryMapping != null){
- return new Path(foundDirectoryMapping).append(existingURL);
- }
- }
- }
- }
- return null;
- } finally {
- if (webAppEdit != null)
- webAppEdit.dispose();
- }
- }
-
- private String getDirectoryMapping(ServletMapping map) {
- IPath extPath = new Path(map.getUrlPattern());
- if (extPath != null){
- String ext = extPath.getFileExtension();
- if (ext == null){
- String lastSeg = extPath.lastSegment();
- if (lastSeg.equals("*")) //$NON-NLS-1$
- return extPath.removeLastSegments(1).toString();
- else
- return extPath.toString();
- }
- }
- return null;
- }
-
- private String getFileExtensionFromMap(ServletMapping map) {
- IPath extPath = new Path(map.getUrlPattern());
- if (extPath != null){
- String ext = extPath.getFileExtension();
- if (ext != null && !ext.equals("")) //$NON-NLS-1$
- return ext;
- }
- return null;
- }
-
- private boolean isJSFPage(IResource resource) {
- // currently always return true.
- // need to find quick way of determining whether this is a JSF JSP Page
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties
deleted file mode 100644
index 4a9da617c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/messages.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Gerry Kessler - initial API and implementation
-# Ian Trimble - change key names for use with org.eclipse.osgi.util.NLS
-###############################################################################
-JSFLibraryRegistry_ErrorCreatingURL=Error creating URL for JSF Library Registry
-JSFLibraryRegistry_NoLoadCreatingNew=Could not load JSF Library Registry; creating new registry
-JSFLibraryRegistry_ErrorSaving=Error saving JSF Library Registry
-JSFLibraryRegistry_DEFAULT_IMPL_LABEL=<Default>
-JSFLibraryRegistry_ErrorLoadingFromExtPt=Error while loading JSF Libaries from extension points
-
-JSFFacetInstallDataModelProvider_ValidateServletName=Specify a servlet name to use
-JSFFacetInstallDataModelProvider_ValidateJSFImpl=A default JSF implementation has not been set. Please use 'Add...' to create a library or un-check deploy jars
-JSFFacetInstallDataModelProvider_ValidateConfigFilePath=The configuration file path is not valid
-JSFFacetInstallDataModelProvider_ValidateConfigFileEmpty=Specify a valid name and location for JSF configuration file
-JSFFacetInstallDataModelProvider_ValidateConfigFileRelative1=Configuration file must be specified relative to the project's {0} folder
-JSFFacetInstallDataModelProvider_ValidateConfigFileRelative2=Configuration file must be located in the project's {0} folder
-JSFFacetInstallDataModelProvider_ValidateConfigFileXML=JSF configuration file must be an XML file
-JSFFacetInstallDataModelProvider_ValidateConfigFileSlashes=Configuration file path must not contain "\\"s. Use "/" instead.
-
-ArchiveFileImpl_CannotCopyFile=Cannot copy file
-ArchiveFileImpl_CannotCloseFile=Cannot close file
-ArchiveFileImpl_CannotLocatePluginRelativeFile=Cannot locate plugin-relative file "{0}"
-
-PluginProvidedJSFLibraryCreationHelper_ErrorCreating=Unable to create JSF Library: {0}
-PluginProvidedJSFLibraryCreationHelper_ErrorMultipleDefinition={0} defined multiple times in {1}
-
-JSFUtils_ErrorCreatingConfigFile=Error creating config file
-JSFUtils_ErrorClosingConfigFile=Error closing config file
-
-JSFAppConfigUtils_ErrorOpeningJarFile=Error opening JarFile "{0}"
-
-JARFileJSFAppConfigProvider_ErrorLoadingModel=Error loading model for file "{0}" \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java
deleted file mode 100644
index d697729d7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/IJSFFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.project.facet;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-
-/**
- * Defines properties used by the JSF facet install data model.
- *
- * @author Gerry Kessler - Oracle
- */
-public interface IJSFFacetInstallDataModelProperties extends IFacetInstallDataModelProperties {
- public static final String IMPLEMENTATION = "IJSFFacetInstallDataModelProperties.IMPLEMENTATION"; //$NON-NLS-1$
- public static final String DEPLOY_IMPLEMENTATION = "IJSFFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION"; //$NON-NLS-1$
- public static final String CONFIG_PATH = "IJSFFacetInstallDataModelProperties.CONFIG_PATH"; //$NON-NLS-1$
- public static final String SERVLET_NAME = "IJSFFacetInstallDataModelProperties.SERVLET_NAME"; //$NON-NLS-1$
- public static final String SERVLET_URL_PATTERNS = "IJSFFacetInstallDataModelProperties.SERVLET_URL_PATTERNS"; //$NON-NLS-1$
- public static final String WEBCONTENT_DIR = "IJSFFacetInstallDataModelProperties.WEBCONTENT_DIR"; //$NON-NLS-1$
-
- public static final String DEFAULT_IMPLEMENTATION_LIBRARY = "IJSFFacetInstallDataModelProperties.DEFAULT_IMPLEMENTATION_LIBRARY";
- public static final String IMPLEMENTATION_LIBRARIES = "IJSFFacetInstallDataModelProperties.IMPLEMENTATION_LIBRARIES";
- public static final String COMPONENT_LIBRARIES = "IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES"; //$NON-NLS-1$
-
-}
-
- \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
deleted file mode 100644
index 20b287f5f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.Messages;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryDecorator;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Provides a data model used by the JSF facet install.
- *
- * @author Gerry Kessler - Oracle
- */
-public class JSFFacetInstallDataModelProvider extends
- FacetInstallDataModelProvider implements
- IJSFFacetInstallDataModelProperties {
-
- private String errorMessage;
- private IPath webContentPath;
-
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(IMPLEMENTATION);
- names.add(DEPLOY_IMPLEMENTATION);
- names.add(CONFIG_PATH);
- names.add(SERVLET_NAME);
- names.add(SERVLET_URL_PATTERNS);
- names.add(WEBCONTENT_DIR);
-
- names.add(IMPLEMENTATION_LIBRARIES);
- names.add(COMPONENT_LIBRARIES);
- names.add(DEFAULT_IMPLEMENTATION_LIBRARY);
-
- return names;
- }
-
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(IMPLEMENTATION)) {
- if (JSFCorePlugin.getDefault().getJSFLibraryRegistry() == null)
- return null;
- return JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation();
- } else if (propertyName.equals(DEPLOY_IMPLEMENTATION)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(CONFIG_PATH)) {
- return JSFUtils.JSF_DEFAULT_CONFIG_PATH; //$NON-NLS-1$;
- } else if (propertyName.equals(SERVLET_NAME)) {
- return "Faces Servlet"; //$NON-NLS-1$
- } else if (propertyName.equals(SERVLET_URL_PATTERNS)) {
- return new String[] { "*.faces" }; //$NON-NLS-1$
- } else if (propertyName.equals(FACET_ID)) {
- return JSFCorePlugin.FACET_ID;
- } else if (propertyName.equals(WEBCONTENT_DIR)){
- return "WebContent"; //not sure I need this
- } else if (propertyName.equals(COMPONENT_LIBRARIES)) {
- return getDefaultJSFComponentLibraries();
- } else if (propertyName.equals(IMPLEMENTATION_LIBRARIES)) {
- return getDefaultJSFImplementationLibraries();
- } else if (propertyName.equals(DEFAULT_IMPLEMENTATION_LIBRARY)) {
- return getDefaultImplementationLibrary();
- }
- return super.getDefaultProperty(propertyName);
- }
- public IStatus validate(String name) {
- errorMessage = null;
- if (name.equals(IMPLEMENTATION) && getBooleanProperty(DEPLOY_IMPLEMENTATION)) {
- return validateImpl((JSFLibrary)getProperty(IMPLEMENTATION));
- } else if (name.equals(CONFIG_PATH)) {
- return validateConfigLocation(getStringProperty(CONFIG_PATH));
- } else if (name.equals(SERVLET_NAME)) {
- return validateServletName(getStringProperty(SERVLET_NAME));
- }
- return super.validate(name);
- }
-
- private IStatus validateServletName(String servletName) {
- if (servletName == null || servletName.trim().length() == 0) {
- errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateServletName;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- else
- return OK_STATUS;
- }
-
- private IStatus validateImpl(JSFLibrary impl) {
- if (impl == null) {
- errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateJSFImpl;
- }
- if (errorMessage != null)
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- else
- return OK_STATUS;
- }
-
- private IStatus validateConfigLocation(String text) {
- if (text == null || text.trim().equals("")) { //$NON-NLS-1$
- errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateConfigFileEmpty;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- text = text.trim();
-
- if (getProjectPath() == null) //this circumstance occurs on page init
- return OK_STATUS;
-
- IPath fullPath = getProjectPath().append(text);
- IPath passedPath = new Path(text);
- if (!fullPath.isValidPath(text)){
- errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateConfigFilePath;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
-
- //FIXME: check for valid file path also [passedPath.toFile().isFile()]
- if (text.toLowerCase().lastIndexOf(".xml") != text.length() - 4) { //$NON-NLS-1$
- errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateConfigFileXML;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
-
- if (text.lastIndexOf("\\") >= 0){ //$NON-NLS-1$
- errorMessage = Messages.JSFFacetInstallDataModelProvider_ValidateConfigFileSlashes;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
-// if (1 == 1){
-// //FIXME!!!!
-// //until i can figure out how to get WebContent dir from the WebApp config,
-// //skip validation here
-// return OK_STATUS;
-// }
-
- if (passedPath.getDevice() != null) {
- errorMessage = NLS.bind(
- Messages.JSFFacetInstallDataModelProvider_ValidateConfigFileRelative1,
- getWebContentFolder().removeFirstSegments(getWebContentFolder().segmentCount() - 1).toString());
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
-
- IPath setPath = getWebContentFolder().append(passedPath);
- if (!getWebContentFolder().isPrefixOf(setPath)) {
- errorMessage = NLS.bind(
- Messages.JSFFacetInstallDataModelProvider_ValidateConfigFileRelative2,
- getWebContentFolder().removeFirstSegments(getWebContentFolder().segmentCount() - 1).toString());
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
-
- return OK_STATUS;
- }
-
- private IPath getProjectPath() {
- String projName = (String)getProperty(FACET_PROJECT_NAME);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- if (project.exists()){
- return project.getLocation();
- } else {
- IDataModel projModel = (IDataModel)getProperty(MASTER_PROJECT_DM);
- if (projModel.getBooleanProperty(IProjectCreationPropertiesNew.USE_DEFAULT_LOCATION)){
- return new Path(projModel.getStringProperty(IProjectCreationPropertiesNew.PROJECT_LOCATION)).append(projName);
- }
- else {
- return new Path(projModel.getStringProperty(IProjectCreationPropertiesNew.USER_DEFINED_LOCATION)).append(projName);
- }
- }
- }
-
- private IPath getWebContentFolder() {
- //One can get here 2 ways:
- //if web app exists and user is adding a facet, or
- // if creating a new web app.
- if (webContentPath != null)
- return webContentPath;
-
- WebArtifactEdit webApp = null;
- try {
- String projName = model.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- IProject proj = ResourcesPlugin.getWorkspace().getRoot()
- .getProject(projName);
- webApp = JSFUtils.getWebArtifactEditForRead(proj);
- if (webApp != null) {
- webContentPath = JSFUtils.getWebArtifactEditForRead(proj)
- .getDeploymentDescriptorPath().removeLastSegments(2);
- return webContentPath;
- } else {
- webContentPath = new Path(getStringProperty(WEBCONTENT_DIR));
- return webContentPath;
- }
-
- } finally {
- if (webApp != null) {
- webApp.dispose();
- }
- }
-
- }
-
-
- private List getDefaultJSFComponentLibraries() {
- List list = new ArrayList();
- JSFLibraryDecorator prjJSFLib = null;
- JSFLibrary jsfLib = null;
- if (JSFCorePlugin.getDefault().getJSFLibraryRegistry() != null) {
- Iterator it = JSFCorePlugin.getDefault().getJSFLibraryRegistry().getNonImplJSFLibraries().iterator();
- boolean selected = false; // not selected when project is created
- while (it.hasNext()) {
- jsfLib = (JSFLibrary)it.next();
- prjJSFLib = new JSFLibraryDecorator(jsfLib, selected, true);
- }
- }
- return list;
- }
-
- private List getDefaultJSFImplementationLibraries() {
- List list = new ArrayList();
- JSFLibraryDecorator prjJSFLib = null;
- JSFLibrary jsfLib = null;
- if (JSFCorePlugin.getDefault().getJSFLibraryRegistry() != null) {
- JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation();
- prjJSFLib = new JSFLibraryDecorator(jsfLib, true, jsfLib.isDeployed());
- list.add(prjJSFLib);
- }
- return list;
- }
-
- private JSFLibraryDecorator getDefaultImplementationLibrary() {
- if (JSFCorePlugin.getDefault().getJSFLibraryRegistry() != null) {
- JSFLibrary jsfLib = JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation();
- return new JSFLibraryDecorator(jsfLib, true, true); // default to be selected
- }
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java
deleted file mode 100644
index 178f7988b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.J2EEModuleDependencyDelegate;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryConfigModelAdapter;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryDecorator;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * JSF Facet Install Delegate for WTP faceted web projects.
- *
- * Uses <code>com.eclispe.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider<code> for model
- * <li> TODO: creates JSF Application Model
- * <li> creates JSF configuration file if not present
- * <li> updates web.xml for: servlet, servlet-mapping and context-param
- * <li> adds implementation jars to WEB-INF/lib if user requests
- *
- * @see com.eclispe.jst.jsf.core.internal.project.facet.JSFFacetInstallConfig
- * @see com.eclispe.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider
- * @author Gerry Kessler - Oracle
- * @since M1
- */
-public class JSFFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object cfg, final IProgressMonitor monitor)
-
- throws CoreException
-
- {
-
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel config = null;
-
- if (cfg != null) {
- config = (IDataModel) cfg;
- } else {
- //FIXME: how would we hit this???
-// config = new JSFFacetInstallConfig();
-// config.setJsfImplID(jsfImplID);
- }
- // Create JSF App Model
- // tbd
-
- // Add JSF Impls to WEB-INF/lib
- //deployJSFLibraries(project, config, monitor);
-
- // Update Model
- java.util.List implLibs = (List) config.getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION_LIBRARIES);
- java.util.List compLibs = (List) config.getProperty(IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES);
- JSFLibraryConfigModelAdapter provider = new JSFLibraryConfigModelAdapter(project);
- JSFLibraryDecorator preSelJSFImplLib = provider.getPreviousJSFImplementation();
-
- // Update J2EE Module dependency for deployment and add JARs into project build path.
- J2EEModuleDependencyDelegate modulesDep = new J2EEModuleDependencyDelegate(project);
- JSFLibraryDecorator selJSFImplLib = (JSFLibraryDecorator)implLibs.get(0);
- if (preSelJSFImplLib != null) {
- modulesDep.removeProjectDependency(preSelJSFImplLib.getLibrary(), monitor);
- }
- modulesDep.addProjectDependency(selJSFImplLib.getLibrary(), selJSFImplLib.checkForDeploy(), monitor);
- JSFLibraryDecorator jsfLibItem;
- for(int i = 0; i < compLibs.size(); i++) {
- jsfLibItem = (JSFLibraryDecorator)compLibs.get(i);
- if (jsfLibItem.isSelected()) {
- modulesDep.addProjectDependency(jsfLibItem.getLibrary(), jsfLibItem.checkForDeploy(), monitor);
- }
- }
- // Update Model
- provider.saveData(implLibs, compLibs);
-
- // Create config file
- createConfigFile(project, fv, config, monitor);
-
- // Update web model
- createServletAndModifyWebXML(project, config, monitor);
-
- if (monitor != null) {
- monitor.worked(1);
- }
-
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
- /** Obsoleted M1 approach
- private void deployJSFLibraries(IProject project,
- final IDataModel config, IProgressMonitor monitor) {
-
- if (config.getBooleanProperty(IJSFFacetInstallDataModelProperties.DEPLOY_IMPLEMENTATION)){
- JSFLibrary impl = (JSFLibrary)config.getProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION);
- if (impl != null){
- IPath destPath = project.getLocation().append(getWebContentPath(project));
- impl.copyTo(destPath.toOSString());
- }
- }
- }
- */
-
- private void createConfigFile(final IProject project,
- final IProjectFacetVersion fv, final IDataModel config,
- IProgressMonitor monitor) {
- final IPath configPath = resolveConfigPath(project, config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH));
-
- try {
- // do not overwrite if the file exists
- if (!configPath.toFile().exists()) {
- IWorkspaceRunnable op = new IWorkspaceRunnable(){
-
- public void run(IProgressMonitor monitor)
- throws CoreException{
- JSFUtils.createConfigFile(fv.getVersionString(),
- configPath);
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- }
-
- };
- op.run(monitor);
- }
- } catch (CoreException e) {
- JSFCorePlugin.getDefault().getMsgLogger().log(e);
- e.printStackTrace();
- }
-
- }
-
- private void createServletAndModifyWebXML(IProject project,
- final IDataModel config, IProgressMonitor monitor) {
- WebApp webApp = null;
- WebArtifactEdit artifactEdit = null;
- try {
- artifactEdit = JSFUtils.getWebArtifactEditForWrite(project);
- webApp = artifactEdit.getWebApp();
-
- // create or update servlet ref
- Servlet servlet = JSFUtils.findJSFServlet(webApp);// check to see
- // if already
- // present
- if (servlet != null) {
- // remove old mappings
- JSFUtils.removeURLMappings(webApp, servlet);
- }
-
- servlet = JSFUtils
- .createOrUpdateServletRef(webApp, config, servlet);
-
- // init mappings
- List listOfMappings = getServletMappings(config);
- JSFUtils.setUpURLMappings(webApp, listOfMappings, servlet);
-
- // setup context params
- if (webApp.getVersionID() == J2EEVersionConstants.WEB_2_3_ID)//shouldn't have to do it this way, but that's the way it goes 119442
- JSFUtils.setupConfigFileContextParamForV2_3(webApp, config);
- else
- JSFUtils.setupConfigFileContextParamForV2_4(webApp, config);
-
- } finally {
- if (artifactEdit != null) {
- // save and dispose
- artifactEdit.saveIfNecessary(monitor);
- artifactEdit.dispose();
- }
- }
- }
-
- private List getServletMappings(IDataModel config) {
- List mappings = new ArrayList();
- String[] patterns = (String[])config.getProperty(IJSFFacetInstallDataModelProperties.SERVLET_URL_PATTERNS);
- for (int i = 0; i < patterns.length; i++) {
- String pattern = patterns[i];
- mappings.add(pattern);
- }
-
- return mappings;
- }
- /*
- private IPath getWebContentPath(IProject project) {
- WebArtifactEdit web = null;
- try {
- web = WebArtifactEdit.getWebArtifactEditForRead(project);
- IPath webxml = web.getDeploymentDescriptorPath();
- //remove project name, WEB-INF an web.xml from path
- IPath webContentPath = webxml.removeLastSegments(2).removeFirstSegments(1);
- return webContentPath;
- } finally {
- if (web != null) {
- web.dispose();
- }
- }
- }
- */
- private IPath resolveConfigPath(IProject project, String jsfConfigPath) {
- // TODO: fix me
- WebArtifactEdit web = null;
- try {
- web = WebArtifactEdit.getWebArtifactEditForRead(project);
- IPath webxml = web.getDeploymentDescriptorPath();
- IPath webcontent = webxml.removeLastSegments(2)
- .removeFirstSegments(1);
-
- return project.getLocation().append(
- webcontent.append(new Path(jsfConfigPath)));
- } finally {
- if (web != null)
- web.dispose();
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java
deleted file mode 100644
index e8371cad9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetUninstallDelegate.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.project.facet;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * JSF Facet Uninstall Delegate for WTP faceted projects.
- *
- * <li> removes JSF servlet, servlet-mappings and context-params
- * <li> leaves JSF configuration files on disk
- * <li> removes JSF classpath containers
- *
- * @author Gerry Kessler - Oracle
- * @since M1
- */
-public class JSFFacetUninstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv,
- Object config, IProgressMonitor monitor) throws CoreException {
- {
-
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
-
- // Remove JSF App Model
-
- // Rempoe JSF Impl Class Container
- // Add JSF Impl Class Container
- // final IJavaProject jproj = JavaCore.create(project);
- // final IPath cont = new
- // Path(JSFImplContainer.CONTAINER_ID).append(project.getName());
- // removeClasspathContainer(jproj, cont);
-
- // remove servlet stuff from web.xml
- uninstallJSFReferencesFromWebApp(project, monitor);
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
- }
-
- private void uninstallJSFReferencesFromWebApp(IProject project,
- IProgressMonitor monitor) {
- WebArtifactEdit artifactEdit = JSFUtils
- .getWebArtifactEditForWrite(project);
- WebApp webApp = artifactEdit.getWebApp();
-
- try {
- Servlet servlet = JSFUtils.findJSFServlet(webApp);
- if (servlet == null)
- return;
-
- // remove faces url mappings
- removeJSFURLMappings(webApp, servlet);
- // remove context params
- removeJSFContextParams(webApp, servlet);
- // remove servlet
- removeJSFServlet(webApp, servlet);
-
- } finally {
- if (artifactEdit != null) {
- artifactEdit.saveIfNecessary(monitor);
- artifactEdit.dispose();
- }
- }
-
- }
-
- private void removeJSFURLMappings(WebApp webApp, Servlet servlet) {
- while (webApp.getServletMapping(servlet) != null) {
- webApp.getServletMappings().remove(
- webApp.getServletMapping(servlet));
- }
- }
-
- private void removeJSFContextParams(WebApp webApp, Servlet servlet) {
- if (webApp.getVersionID() == J2EEVersionConstants.WEB_2_3_ID){
- Iterator it = webApp.getContexts().iterator();
- while (it.hasNext()) {
- ContextParam cp = (ContextParam) it.next();
- if (cp.getParamName().equals(JSFUtils.JSF_CONFIG_CONTEXT_PARAM)) {
- webApp.getContexts().remove(cp);
- break;
- }
- }
- }
- else {//could check for 2_4 version here.
- //hoping that the API gets fixed so I don't need to do any of this version checking
- Iterator it = webApp.getContextParams().iterator();
- while (it.hasNext()) {
- ParamValue cp = (ParamValue) it.next();
- if (cp.getName().equals(JSFUtils.JSF_CONFIG_CONTEXT_PARAM)) {
- webApp.getContextParams().remove(cp);
- break;
- }
- }
- }
- }
-
- private void removeJSFServlet(WebApp webApp, Servlet servlet) {
- webApp.getServlets().remove(servlet);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java
deleted file mode 100644
index 427354ea5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.project.facet;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.Messages;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Utility file for JSF model
- *
- * @author Gerry Kessler - Oracle
- * @since M1
- */
-public class JSFUtils {
- public static final String JSF_SERVLET_CLASS = "javax.faces.webapp.FacesServlet"; //$NON-NLS-1$
- public static final String JSF_CONFIG_CONTEXT_PARAM = "javax.faces.CONFIG_FILES"; //$NON-NLS-1$
- public static final String JSF_DEFAULT_CONFIG_PATH = "/WEB-INF/faces-config.xml"; //$NON-NLS-1$
-
- public static final String PP_JSF_FACET_INSTALLED = "is.jsf.project";
- public static final String PP_JSF_DEPLOY_ME = "deploy.jsf.libraries";
- public static final String PP_JSF_IMPL_LIB = "jsf.impl.lib";
- public static final String PP_JSF_NONIMPL_LIB = "jsf.nonimpl.lib";
- public static final String PP_JSF_AVAIL_COMP_LIB = "jsf.comp.lib.avail";
- public static final String PP_JSF_SEL_COMP_LIB = "jsf.comp.lib.selected";
-
- public static final String PP_JSF_IMPLEMENTATION_LIBRARIES = "jsf.implementation.libraries";
- public static final String PP_JSF_COMPONENT_LIBRARIES = "jsf.component.libraries";
-
-
- /**
- * Convenience method for getting writeable WebApp model
- * @param IProject
- * @return WebArtifactEdit
- */
- public static WebArtifactEdit getWebArtifactEditForWrite(IProject project) {
- return WebArtifactEdit.getWebArtifactEditForWrite(project);
- }
-
- /**
- * Convenience method for getting read-only WebApp model
- * @param IProject
- * @return WebArtifactEdit
- */
- public static WebArtifactEdit getWebArtifactEditForRead(IProject project) {
- return WebArtifactEdit.getWebArtifactEditForRead(project);
- }
-
- /**
- * @param webApp
- * @return Servlet - the JSF Servlet for the specified WebApp or null if not present
- */
- public static Servlet findJSFServlet(WebApp webApp) {
- Servlet servlet = null;
- Iterator it = webApp.getServlets().iterator();
- while (it.hasNext()) {
- servlet = (Servlet) it.next();
- if (servlet.getWebType().isServletType()) {
- if (((ServletType) servlet.getWebType()).getClassName().equals(
- JSF_SERVLET_CLASS)) {
- break;
- }
- } else if (servlet.getWebType().isJspType()) {
- if (((JSPType) servlet.getWebType()).getJspFile().equals(
- JSF_SERVLET_CLASS)) {
- break;
- }
- }
- }
- return servlet;
- }
-
- /**
- * Creates a stubbed JSF configuration file for specified JSF version and path
- * @param String jsfVersion
- * @param String configPath
- */
- public static void createConfigFile(String jsfVersion, IPath configPath) {
- FileOutputStream os = null;
- PrintWriter pw = null;
- final String QUOTE = new String(new char[] { '"' });
- try {
- IPath dirPath = configPath.removeLastSegments(1);
- dirPath.toFile().mkdirs();
- File file = configPath.toFile();
- file.createNewFile();
- os = new FileOutputStream(file);
- pw = new PrintWriter(os);
- pw.write("<?xml version=" + QUOTE + "1.0" + QUOTE + " encoding=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- + QUOTE + "UTF-8" + QUOTE + "?>\n\n"); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (jsfVersion.equals("1.1")) { //$NON-NLS-1$
- pw.write("<!DOCTYPE faces-config PUBLIC\n"); //$NON-NLS-1$
- pw
- .write(" " //$NON-NLS-1$
- + QUOTE
- + "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" //$NON-NLS-1$
- + QUOTE + "\n"); //$NON-NLS-1$
- pw.write(" " + QUOTE //$NON-NLS-1$
- + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" //$NON-NLS-1$
- + QUOTE + ">\n\n"); //$NON-NLS-1$
-
- pw.write("<faces-config>\n\n"); //$NON-NLS-1$
- pw.write("</faces-config>\n"); //$NON-NLS-1$
- } else if (jsfVersion.equals("1.2")) { //$NON-NLS-1$
- pw.write("<faces-config\n"); //$NON-NLS-1$
- pw.write(" " + "xmlns=" + QUOTE //$NON-NLS-1$ //$NON-NLS-2$
- + "http://java.sun.com/xml/ns/j2ee" + QUOTE + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
- pw.write(" " + "xmlns:xsi=" + QUOTE //$NON-NLS-1$ //$NON-NLS-2$
- + "http://www.w3.org/2001/XMLSchema-instance" + QUOTE //$NON-NLS-1$
- + "\n"); //$NON-NLS-1$
- pw
- .write(" " //$NON-NLS-1$
- + "xsi:schemaLocation=" //$NON-NLS-1$
- + QUOTE
- + "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-facesconfig_1_2.xsd" //$NON-NLS-1$
- + QUOTE + "\n"); //$NON-NLS-1$
- pw.write(" " + "version=" + QUOTE + "1.2" + QUOTE + ">\n\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- pw.write("</faces-config>\n"); //$NON-NLS-1$
- }
-
- pw.close();
- pw = null;
- } catch (FileNotFoundException e) {
- JSFCorePlugin.log(IStatus.ERROR, Messages.JSFUtils_ErrorCreatingConfigFile, e);
- } catch (IOException e) {
- JSFCorePlugin.log(IStatus.ERROR, Messages.JSFUtils_ErrorCreatingConfigFile, e);
- } finally {
- if (pw != null)
- pw.close();
- if (os != null) {
- try {
- os.close();
- } catch (IOException e) {
- JSFCorePlugin.log(IStatus.ERROR, Messages.JSFUtils_ErrorClosingConfigFile, e);
- }
- }
- }
- }
-
- /**
- * Creates servlet reference in WebApp if not present or updates servlet name if found
- * using the passed configuration.
- *
- * @param WebApp webApp
- * @param IDataModel config
- * @param Servlet servlet
- * @return Servlet servlet - if passed servlet was null, will return created servlet
- */
- public static Servlet createOrUpdateServletRef(WebApp webApp,
- IDataModel config, Servlet servlet) {
- String displayName = config.getStringProperty(IJSFFacetInstallDataModelProperties.SERVLET_NAME);
-
- if (servlet == null) {
- // Create the servlet instance and set up the parameters from data
- // model
- servlet = WebapplicationFactory.eINSTANCE.createServlet();
- servlet.setServletName(displayName);
-
- ServletType servletType = WebapplicationFactory.eINSTANCE
- .createServletType();
- servletType.setClassName(JSF_SERVLET_CLASS);
- servlet.setWebType(servletType);
- servlet.setLoadOnStartup(new Integer(1));
- // Add the servlet to the web application model
- webApp.getServlets().add(servlet);
- } else {
- // update
- servlet.setServletName(displayName);
- servlet.setLoadOnStartup(new Integer(1));
- }
- return servlet;
- }
-
- /**
- * Creates servlet-mappings for the servlet
- *
- * @param WebApp webApp
- * @param List urlMappingList - list of string values to be used in url-pattern for servlet-mapping
- * @param Servlet servlet
- */
- public static void setUpURLMappings(WebApp webApp, List urlMappingList,
- Servlet servlet) {
- // Add mappings
- Iterator it = urlMappingList.iterator();
- while (it.hasNext()) {
- String pattern = (String) it.next();
- ServletMapping mapping = WebapplicationFactory.eINSTANCE
- .createServletMapping();
- mapping.setServlet(servlet);
- mapping.setName(servlet.getServletName());
- mapping.setUrlPattern(pattern);
- webApp.getServletMappings().add(mapping);
- }
- }
-
- /**
- * Removes servlet-mappings for servlet using servlet-name.
- * @param WebApp webApp
- * @param Servlet servlet
- */
- public static void removeURLMappings(WebApp webApp, Servlet servlet) {
- String servletName = servlet.getServletName();
- if (servletName != null) {
- Iterator oldMappings = webApp.getServletMappings().iterator();
- while (oldMappings.hasNext()) {
- ServletMapping mapping = (ServletMapping) oldMappings.next();
- if (mapping.getServlet().getServletName()
- .equals(servletName)) {
- webApp.getServletMappings().remove(mapping);
- }
- }
- }
- }
-
- /**
- * Creates or updates config file context-param in v 2.3 WebApp if non default configuration file is specified.
- * @param WebApp webApp
- * @param IDataModel config
- */
- public static void setupConfigFileContextParamForV2_3(WebApp webApp,
- IDataModel config) {
- // if not default name and location, then add context param
- ContextParam cp = null;
- ContextParam foundCP = null;
- boolean found = false;
- if (!config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH).equals(JSF_DEFAULT_CONFIG_PATH)) {
- // check to see if present
- Iterator it = webApp.getContexts().iterator();
- while (it.hasNext()) {
- cp = (ContextParam) it.next();
- if (cp.getParamName().equals(JSF_CONFIG_CONTEXT_PARAM)) {
- foundCP = cp;
- found = true;
- }
- }
- if (!found) {
- cp = WebapplicationFactory.eINSTANCE.createContextParam();
- cp.setParamName(JSF_CONFIG_CONTEXT_PARAM);
- cp.setParamValue(config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH));
- webApp.getContexts().add(cp);
- } else {
- cp = foundCP;
- if (cp.getParamValue().indexOf(config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH)) < 0) {
- String curVal = cp.getParamValue();
- String val = config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH);
- if (curVal != null || !curVal.trim().equals("")) { //$NON-NLS-1$
- val = curVal + ",\n" + val; //$NON-NLS-1$
- }
- cp.setParamValue(val);
- }
- }
- }
- }
- /**
- * Creates or updates config file context-param in v2.4 WebApp if non default configuration file is specified.
- * @param WebApp webApp
- * @param IDataModel config
- */
- public static void setupConfigFileContextParamForV2_4(WebApp webApp,
- IDataModel config) {
- // if not default name and location, then add context param
- ParamValue foundCP = null;
- ParamValue cp = null;
- boolean found = false;
- if (!config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH).equals(JSF_DEFAULT_CONFIG_PATH)) {
- // check to see if present
- Iterator it = webApp.getContextParams().iterator();
- while (it.hasNext()) {
- cp = (ParamValue) it.next();
- if (cp.getName().equals(JSF_CONFIG_CONTEXT_PARAM)) {
- foundCP = cp;
- found = true;
- }
- }
- if (!found) {
- ParamValue pv = CommonFactory.eINSTANCE.createParamValue();
- pv.setName(JSF_CONFIG_CONTEXT_PARAM);
- pv.setValue(config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH));
- webApp.getContextParams().add(pv);
- } else {
- cp = foundCP;
- if (cp.getValue().indexOf(config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH)) < 0) {
- String curVal = cp.getValue();
- String val = config.getStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH);
- if (curVal != null || !curVal.trim().equals("")) { //$NON-NLS-1$
- val = curVal + ",\n" + val; //$NON-NLS-1$
- }
- cp.setValue(val);
- }
- }
- }
- }
-
- public static IPath[] getJARPathforJSFLib(JSFLibrary jsfLib) {
- EList archiveFiles = jsfLib.getArchiveFiles();
- int numJars = archiveFiles.size();
- String name = null;
- IPath[] elements = new IPath[numJars];
- for (int i= 0; i < numJars; i++) {
- elements[i] = new Path(((ArchiveFile)archiveFiles.get(i)).getResolvedSourceLocation()).makeAbsolute();
- }
- return elements;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigLocater.java
deleted file mode 100644
index 0252fea04..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigLocater.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * Abstract implementation of {@link IJSFAppConfigLocater} that provides common
- * locater functionality. {@link IJSFAppConfigLocater} implementations should
- * extend this class or provide similar functionality.
- *
- * @author Ian Trimble - Oracle
- */
-public abstract class AbstractJSFAppConfigLocater implements IJSFAppConfigLocater {
-
- /**
- * {@link JSFAppConfigManager} instance to which this locater belongs.
- */
- protected JSFAppConfigManager manager = null;
-
- /**
- * Set of known {@link IJSFAppConfigProvider} instances.
- */
- protected Set configProviders = new LinkedHashSet();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigLocater#setJSFAppConfigManager(org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager)
- */
- public void setJSFAppConfigManager(JSFAppConfigManager manager) {
- this.manager = manager;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigLocater#getJSFAppConfigManager()
- */
- public JSFAppConfigManager getJSFAppConfigManager() {
- return manager;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigLocater#startLocating()
- */
- public abstract void startLocating();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigLocater#stopLocating()
- */
- public abstract void stopLocating();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigLocater#getJSFAppConfigProviders()
- */
- public Set getJSFAppConfigProviders() {
- return configProviders;
- }
-
- /**
- * Adds an {@link IJSFAppConfigProvider} instance to the set of known
- * instances and notifies {@link JSFAppConfigManager} instance of the
- * addition if successful.
- *
- * @param configProvider {@link IJSFAppConfigProvider} instance to be
- * added.
- * @return true if instance was added, else false.
- */
- protected boolean addConfigProvider(IJSFAppConfigProvider configProvider) {
- boolean added = configProviders.add(configProvider);
- if (added && manager != null) {
- configProvider.setJSFAppConfigLocater(this);
- manager.notifyJSFAppConfigProvidersChangeListeners(
- configProvider,
- JSFAppConfigProvidersChangeEvent.ADDED);
- }
- return added;
- }
-
- /**
- * Removes an {@link IJSFAppConfigProvider} instance from the set of known
- * instances and notifies {@link JSFAppConfigManager} instance of the
- * removal if successful.
- *
- * @param configProvider {@link IJSFAppConfigProvider} instance to be
- * removed.
- * @return true if instance was removed, else false.
- */
- protected boolean removeConfigProvider(IJSFAppConfigProvider configProvider) {
- if (configProvider != null) {
- configProvider.releaseFacesConfigModel();
- }
- boolean removed = configProviders.remove(configProvider);
- if (removed && manager != null) {
- manager.notifyJSFAppConfigProvidersChangeListeners(
- configProvider,
- JSFAppConfigProvidersChangeEvent.REMOVED);
- }
- return removed;
- }
-
- /**
- * Updates known set of {@link IJSFAppConfigProvider} instances by removing
- * instances that are in the existing set but not in the passed set and
- * adding instances that are in the passed set but not in the existing set.
- * Instances that are in both the existing set and the passed set are left
- * unchanged. The {@link JSFAppConfigManager} is notified of removals and
- * additions, and no notification is sent for instances that are left
- * unchanged.
- *
- * @param newConfigProviders New set of {@link IJSFAppConfigProvider}
- * instances.
- */
- protected void updateConfigProviders(Set newConfigProviders) {
- if (newConfigProviders != null) {
- LinkedHashSet oldConfigProviders = new LinkedHashSet();
- //iterate over existing set
- Iterator itConfigProviders = configProviders.iterator();
- while (itConfigProviders.hasNext()) {
- IJSFAppConfigProvider configProvider = (IJSFAppConfigProvider)itConfigProviders.next();
- //remove provider from new set if it is already in existing set
- if (!newConfigProviders.remove(configProvider)) {
- //stage removal of existing provider that is not in new set
- oldConfigProviders.add(configProvider);
- }
- }
- //remove providers that are not in new set from existing set
- Iterator itOldConfigProviders = oldConfigProviders.iterator();
- while (itOldConfigProviders.hasNext()) {
- IJSFAppConfigProvider configProvider = (IJSFAppConfigProvider)itOldConfigProviders.next();
- //call removeConfigProvider(...) method so manager's listeners are notified
- removeConfigProvider(configProvider);
- }
- //add providers that are still in new set to existing set
- Iterator itNewConfigProviders = newConfigProviders.iterator();
- while (itNewConfigProviders.hasNext()) {
- IJSFAppConfigProvider configProvider = (IJSFAppConfigProvider)itNewConfigProviders.next();
- //call addConfigProvider(...) method so manager's listeners are notified
- addConfigProvider(configProvider);
- }
- }
- }
-
- /**
- * Removes all {@link IJSFAppConfigProvider} instances from the known set,
- * sending notification of all removals to the {@link JSFAppConfigManager}
- * instance.
- */
- protected void removeAllConfigProviders() {
- updateConfigProviders(Collections.EMPTY_SET);
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#finalize()
- */
- protected void finalize() {
- removeAllConfigProviders();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigProvider.java
deleted file mode 100644
index de200d322..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-
-/**
- * Abstract implementation of {@link IJSFAppConfigProvider} that provides
- * common provider functionality. {@link IJSFAppConfigProvider} instances
- * should extend this class or provide similar functionality.
- *
- * @author Ian Trimble - Oracle
- *
- */
-public abstract class AbstractJSFAppConfigProvider implements IJSFAppConfigProvider {
-
- /**
- * {@link IJSFAppConfigLocater} instance that located this instance.
- */
- protected IJSFAppConfigLocater jsfAppConfigLocater = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#setJSFAppConfigLocater(org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigLocater)
- */
- public void setJSFAppConfigLocater(IJSFAppConfigLocater locater) {
- this.jsfAppConfigLocater = locater;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#getFacesConfigModel()
- */
- public abstract FacesConfigType getFacesConfigModel();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#releaseFacesConfigModel()
- */
- public abstract void releaseFacesConfigModel();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ArtifactEditJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ArtifactEditJSFAppConfigProvider.java
deleted file mode 100644
index f94e7ab64..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ArtifactEditJSFAppConfigProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-
-/**
- * ArtifactEditJSFAppConfigProvider uses FacesConfigArtifactEdit to provide
- * the root element of an application configuration model.
- *
- * @author Ian Trimble - Oracle
- */
-public class ArtifactEditJSFAppConfigProvider extends AbstractJSFAppConfigProvider {
-
- /**
- * IFile instance that represents an application configuration resource
- * file.
- */
- protected IFile appConfigFile = null;
-
- /**
- * FacesConfigArtifactEdit instance used to get the application
- * configuration model.
- */
- protected FacesConfigArtifactEdit facesConfigArtifactEdit = null;
-
- /**
- * Cached {@link FacesConfigType} instance.
- */
- protected FacesConfigType facesConfig = null;
-
- /**
- * Creates an instance, storing the passed IFile instance for subsequent
- * processing.
- *
- * @param appConfigFile IFile instance that represents an application
- * configuration resource file
- */
- public ArtifactEditJSFAppConfigProvider(IFile appConfigFile) {
- this.appConfigFile = appConfigFile;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#getFacesConfigModel()
- */
- public FacesConfigType getFacesConfigModel() {
- if (facesConfig == null) {
- if (appConfigFile != null) {
- IProject project = appConfigFile.getProject();
- IPath appConfigFilePath = JSFAppConfigUtils.getWebContentFolderRelativePath(appConfigFile);
- if (appConfigFilePath != null) {
- facesConfigArtifactEdit = FacesConfigArtifactEdit.getFacesConfigArtifactEditForRead(project, appConfigFilePath.toString());
- if (facesConfigArtifactEdit != null) {
- facesConfig = facesConfigArtifactEdit.getFacesConfig();
- if (facesConfig != null) {
- jsfAppConfigLocater.getJSFAppConfigManager().addFacesConfigChangeAdapter(facesConfig);
- }
- }
- }
- }
- }
- return facesConfig;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#releaseFacesConfigModel()
- */
- public void releaseFacesConfigModel() {
- jsfAppConfigLocater.getJSFAppConfigManager().removeFacesConfigChangeAdapter(facesConfig);
- if (facesConfigArtifactEdit != null) {
- facesConfigArtifactEdit.dispose();
- }
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object otherObject) {
- boolean equals = false;
- if (otherObject != null && otherObject instanceof ArtifactEditJSFAppConfigProvider) {
- IFile otherAppConfigFile = ((ArtifactEditJSFAppConfigProvider)otherObject).appConfigFile;
- if (appConfigFile != null) {
- equals = appConfigFile.equals(otherAppConfigFile);
- } else {
- equals = otherAppConfigFile == null;
- }
- }
- return equals;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return appConfigFile != null ? appConfigFile.hashCode() : 0;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer sb = new StringBuffer("ArtifactEditJSFAppConfigProvider["); //$NON-NLS-1$
- if (appConfigFile != null) {
- sb.append(appConfigFile.toString());
- } else {
- sb.append("null"); //$NON-NLS-1$
- }
- sb.append("]"); //$NON-NLS-1$
- return sb.toString();
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#finalize()
- */
- protected void finalize() {
- releaseFacesConfigModel();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java
deleted file mode 100644
index 09d822f5b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * ContextParamSpecifiedJSFAppConfigLocater attempts to locate application
- * configuration files specified by the JSF CONFIG_FILES context parameter.
- *
- * @author Ian Trimble - Oracle
- */
-public class ContextParamSpecifiedJSFAppConfigLocater extends WebContentRelativeJSFAppConfigLocater {
-
- /**
- * Cached instance of ContextParamAdapter.
- */
- protected ContextParamAdapter contextParamAdapter = null;
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#startLocating()
- */
- public void startLocating() {
- locateProviders();
- WebArtifactEdit webArtifactEdit = WebArtifactEdit.getWebArtifactEditForRead(manager.getProject());
- if (webArtifactEdit != null) {
- WebApp webApp = webArtifactEdit.getWebApp();
- if (webApp != null) {
- contextParamAdapter = new ContextParamAdapter();
- webApp.eAdapters().add(contextParamAdapter);
- EList contexts = webApp.getContexts();
- if (contexts != null) {
- Iterator itContexts = contexts.iterator();
- while (itContexts.hasNext()) {
- ContextParam contextParam = (ContextParam)itContexts.next();
- contextParam.eAdapters().add(contextParamAdapter);
- }
- }
- EList contextParams = webApp.getContextParams();
- if (contextParams != null) {
- Iterator itContextParams = contextParams.iterator();
- while (itContextParams.hasNext()) {
- ParamValue paramValue = (ParamValue)itContextParams.next();
- paramValue.eAdapters().add(contextParamAdapter);
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#stopLocating()
- */
- public void stopLocating() {
- if (contextParamAdapter != null) {
- WebArtifactEdit webArtifactEdit = WebArtifactEdit.getWebArtifactEditForRead(manager.getProject());
- if (webArtifactEdit != null) {
- WebApp webApp = webArtifactEdit.getWebApp();
- if (webApp != null) {
- webApp.eAdapters().remove(contextParamAdapter);
- EList contexts = webApp.getContexts();
- if (contexts != null) {
- Iterator itContexts = contexts.iterator();
- while (itContexts.hasNext()) {
- ContextParam contextParam = (ContextParam)itContexts.next();
- contextParam.eAdapters().remove(contextParamAdapter);
- }
- }
- EList contextParams = webApp.getContextParams();
- if (contextParams != null) {
- Iterator itContextParams = contextParams.iterator();
- while (itContextParams.hasNext()) {
- ParamValue paramValue = (ParamValue)itContextParams.next();
- paramValue.eAdapters().remove(contextParamAdapter);
- }
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.WebContentRelativeJSFAppConfigLocater#getFilenames()
- */
- protected List getFilenames() {
- return JSFAppConfigUtils.getConfigFilesFromContextParam(manager.getProject());
- }
-
- /**
- * Adapter implementation used to monitor addition/removal of context-param
- * nodes and change in name of existing nodes in order to respond to
- * changes to the JSF CONFIG_FILES context-param.
- *
- * @author Ian Trimble - Oracle
- */
- class ContextParamAdapter extends AdapterImpl {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification notification) {
- Object objNotifier = notification.getNotifier();
- if (objNotifier instanceof WebApp) {
- int eventType = notification.getEventType();
- switch (eventType) {
- case Notification.ADD:
- Object objNewValue = notification.getNewValue();
- if (objNewValue instanceof ContextParam) {
- contextParamAdded((ContextParam)objNewValue);
- } else if (objNewValue instanceof ParamValue) {
- paramValueAdded((ParamValue)objNewValue);
- }
- break;
- case Notification.REMOVE:
- Object objOldValue = notification.getOldValue();
- if (objOldValue instanceof ContextParam) {
- contextParamRemoved((ContextParam)objOldValue);
- } else if (objOldValue instanceof ParamValue) {
- paramValueRemoved((ParamValue)objOldValue);
- }
- break;
- }
- } else if (objNotifier instanceof ContextParam) {
- if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
- locateProviders();
- }
- } else if (objNotifier instanceof ParamValue) {
- if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
- locateProviders();
- }
- }
- }
-
- /**
- * Called when a new ContextParam instance is added.
- *
- * @param contextParam ContextParam instance.
- */
- protected void contextParamAdded(ContextParam contextParam) {
- if (isConfigFilesContextParam(contextParam)) {
- locateProviders();
- }
- contextParam.eAdapters().add(this);
- }
-
- /**
- * Called when a new ParamValue instance is added.
- *
- * @param paramValue ParamValue instance.
- */
- protected void paramValueAdded(ParamValue paramValue) {
- if (isConfigFilesParamValue(paramValue)) {
- locateProviders();
- }
- paramValue.eAdapters().add(this);
- }
-
- /**
- * Called when a ContextParam instance is removed.
- *
- * @param contextParam ContextParam instance.
- */
- protected void contextParamRemoved(ContextParam contextParam) {
- if (isConfigFilesContextParam(contextParam)) {
- locateProviders();
- }
- contextParam.eAdapters().remove(this);
- }
-
- /**
- * Called when a ParamValue instance is removed.
- *
- * @param paramValue ParamValue instance.
- */
- protected void paramValueRemoved(ParamValue paramValue) {
- if (isConfigFilesParamValue(paramValue)) {
- locateProviders();
- }
- paramValue.eAdapters().remove(this);
- }
-
- /**
- * Tests if the passed ContextParam instance is the JSF CONFIG_FILES
- * context parameter.
- *
- * @param contextParam ContextParam instance.
- * @return true if the passed ContextParam instance is the JSF
- * CONFIG_FILES context parameter, else false
- */
- protected boolean isConfigFilesContextParam(ContextParam contextParam) {
- boolean isConfigFiles = false;
- if (contextParam != null) {
- String name = contextParam.getParamName();
- if (name != null && name.equals(JSFAppConfigUtils.CONFIG_FILES_CONTEXT_PARAM_NAME)) {
- isConfigFiles = true;
- }
- }
- return isConfigFiles;
- }
-
- /**
- * Tests if the passed ParamValue instance is the JSF CONFIG_FILES
- * context parameter.
- *
- * @param paramValue ParamValue instance.
- * @return true if the passed ParamValue instance is the JSF
- * CONFIG_FILES context parameter, else false
- */
- protected boolean isConfigFilesParamValue(ParamValue paramValue) {
- boolean isConfigFiles = false;
- if (paramValue != null) {
- String name = paramValue.getName();
- if (name != null && name.equals(JSFAppConfigUtils.CONFIG_FILES_CONTEXT_PARAM_NAME)) {
- isConfigFiles = true;
- }
- }
- return isConfigFiles;
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/DefaultJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/DefaultJSFAppConfigLocater.java
deleted file mode 100644
index 8e9f24c86..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/DefaultJSFAppConfigLocater.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * DefaultJSFAppConfigLocater attempts to locate the default application
- * configuration file, located at "/WEB-INF/faces-config.xml".
- *
- * @author Ian Trimble - Oracle
- */
-public class DefaultJSFAppConfigLocater extends WebContentRelativeJSFAppConfigLocater
- implements IResourceChangeListener {
-
- /**
- * Web content folder-relative name of the default application
- * configuration resource file.
- */
- public static final String DEF_APPCONFIGRESOURCE_FILENAME = "WEB-INF/faces-config.xml"; //$NON-NLS-1$
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#startLocating()
- */
- public void startLocating() {
- locateProviders();
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- workspace.addResourceChangeListener(this, IResourceChangeEvent.POST_BUILD);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#stopLocating()
- */
- public void stopLocating() {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- workspace.removeResourceChangeListener(this);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.WebContentRelativeJSFAppConfigLocater#getFilenames()
- */
- protected List getFilenames() {
- List filenames = new ArrayList();
- filenames.add(DEF_APPCONFIGRESOURCE_FILENAME);
- return filenames;
- }
-
- /**
- * Responds to resource change events.
- *
- * @param event IResourceChangeEvent instance.
- */
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- try {
- delta.accept(new ResourceDeltaVisitor());
- } catch (CoreException cex) {
- JSFCorePlugin.log(
- IStatus.WARNING,
- cex.getLocalizedMessage(),
- cex);
- }
- }
-
- /**
- * ResourceDeltaVisitor is used to visit an IResourceDelta instance to
- * discover if the default application configuration resource file has
- * been added or removed.
- *
- * @author Ian Trimble - Oracle
- */
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-
- /**
- * Cached IPath instance for default configuration resource file.
- */
- protected IPath defConfigPath = null;
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) {
- boolean visitChildren = false;
- initDefConfigPath();
- if (defConfigPath != null) {
- IPath deltaPath = delta.getFullPath();
- if (deltaPath != null) {
- if (defConfigPath.equals(deltaPath)) {
- locateProviders();
- } else if (deltaPath.isPrefixOf(defConfigPath)) {
- visitChildren = true;
- }
- }
- } else {
- locateProviders();
- }
- return visitChildren;
- }
-
- /**
- * Determines IPath instance for default configuration resource file
- * and caches in class member.
- */
- protected void initDefConfigPath() {
- if (defConfigPath == null) {
- IProject project = manager.getProject();
- if (project != null) {
- IVirtualFolder webContentFolder = JSFAppConfigUtils.getWebContentFolder(project);
- if (webContentFolder != null) {
- IVirtualResource defConfigFile = webContentFolder.findMember(DEF_APPCONFIGRESOURCE_FILENAME);
- if (defConfigFile != null) {
- defConfigPath = defConfigFile.getWorkspaceRelativePath();
- }
- }
- }
- }
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IFacesConfigChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IFacesConfigChangeListener.java
deleted file mode 100644
index e1c526fd8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IFacesConfigChangeListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import org.eclipse.emf.common.notify.Notification;
-
-/**
- * IFacesConfigChangeListener is the interface that must be implemented by
- * objects interested in receiving notification of changes to application
- * configuration models.
- *
- * @author Ian Trimble - Oracle
- */
-public interface IFacesConfigChangeListener {
-
- /**
- * Called when a change in an application configuration model for which
- * this listener has been registered occurs.
- *
- * @param notification EMF {@link Notification} instance that describes the
- * model change.
- */
- public void notifyChanged(Notification notification);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigLocater.java
deleted file mode 100644
index 824c519c7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigLocater.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.Set;
-
-/**
- * IJSFAppConfigLocater is the interface that Objects capable of locating
- * and providing JSF application configuration resources must implement.
- *
- * @author Ian Trimble - Oracle
- */
-public interface IJSFAppConfigLocater {
-
- /**
- * Sets the {@link JSFAppConfigManager} instance to which this locater
- * belongs.
- *
- * @param manager {@link JSFAppConfigManager} instance to be set.
- */
- public void setJSFAppConfigManager(JSFAppConfigManager manager);
-
- /**
- * Gets the {@link JSFAppConfigManager} instance to which this locater
- * belongs.
- *
- * @return {@link JSFAppConfigManager} instance to which this locater
- * belongs.
- */
- public JSFAppConfigManager getJSFAppConfigManager();
-
- /**
- * Starts locating JSF application configuration resources.
- */
- public void startLocating();
-
- /**
- * Stops locating JSF application configuration resources.
- */
- public void stopLocating();
-
- /**
- * Gets the set of {@link IJSFAppConfigProvider} instances that this
- * locater has located.
- *
- * @return set of {@link IJSFAppConfigProvider} instances.
- */
- public Set getJSFAppConfigProviders();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvider.java
deleted file mode 100644
index b85fb1827..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-
-/**
- * IJSFAppConfigProvider is the interface that Objects capable of providing
- * JSF application configuration models must implement.
- *
- * @author Ian Trimble - Oracle
- */
-public interface IJSFAppConfigProvider {
-
- /**
- * Sets the {@link IJSFAppConfigLocater} instance that located this
- * instance.
- *
- * @param locater {@link IJSFAppConfigLocater} instance that located this
- * instance.
- */
- public void setJSFAppConfigLocater(IJSFAppConfigLocater locater);
-
- /**
- * Gets the root element of the application configuration model for read
- * access.
- *
- * @return FacesConfigType instance, which is the root element of an
- * application configuration model.
- */
- public FacesConfigType getFacesConfigModel();
-
- /**
- * Releases resources associated with acquiring the application
- * configuration model (if any).
- */
- public void releaseFacesConfigModel();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvidersChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvidersChangeListener.java
deleted file mode 100644
index 7bbf23180..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvidersChangeListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-/**
- * Interface that an Object wishing to be notified about changes to the Set of
- * IJSFAppConfigProvider instances implements.
- *
- * @author Ian Trimble - Oracle.
- */
-public interface IJSFAppConfigProvidersChangeListener {
-
- /**
- * Callback method indicating a change in the Set of JSFAppConfigProvider
- * instances.
- *
- * @param event JSFAppConfigProvidersChangeEvent instance.
- */
- public void changedJSFAppConfigProviders(JSFAppConfigProvidersChangeEvent event);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java
deleted file mode 100644
index 42c11c39f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * ImplicitRuntimeJSFAppConfigLocater creates an {@link IJSFAppConfigProvider}
- * instance that provides an application configuration model that contains
- * implicit configuration elements that are specified as required to be
- * provided by a JSF implementation.
- *
- * @author Ian Trimble - Oracle
- */
-public class ImplicitRuntimeJSFAppConfigLocater extends AbstractJSFAppConfigLocater {
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#startLocating()
- */
- public void startLocating() {
- locateProviders();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#stopLocating()
- */
- public void stopLocating() {
- //nothing to do
- }
-
- /**
- * Adds an {@link IJSFAppConfigProvider} instance that provides an
- * application configuration model that contains implicit configuration
- * objects provided by a JSF implementation at runtime.
- */
- public void locateProviders() {
- Set newConfigProviders = new LinkedHashSet();
- newConfigProviders.add(new ImplicitRuntimeJSFAppConfigProvider());
- updateConfigProviders(newConfigProviders);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java
deleted file mode 100644
index 788a17b2d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-
-/**
- * ImplicitRuntimeJSFAppConfigProvider provides an application configuration
- * model that contains implicit configuration objects provided by a JSF
- * implementation at runtime.
- *
- * @author Ian Trimble - Oracle
- */
-public class ImplicitRuntimeJSFAppConfigProvider extends AbstractJSFAppConfigProvider {
-
- /**
- * Cached {@link FacesConfigType} instance.
- */
- protected FacesConfigType facesConfig = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#getFacesConfigModel()
- */
- public FacesConfigType getFacesConfigModel() {
- if (facesConfig == null) {
- createModel();
- if (facesConfig != null) {
- jsfAppConfigLocater.getJSFAppConfigManager().addFacesConfigChangeAdapter(facesConfig);
- }
- }
- return facesConfig;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#releaseFacesConfigModel()
- */
- public void releaseFacesConfigModel() {
- jsfAppConfigLocater.getJSFAppConfigManager().removeFacesConfigChangeAdapter(facesConfig);
- facesConfig = null;
- }
-
- /**
- * Creates the application configuration model and assigns it to the
- * facesConfig property.
- */
- protected void createModel() {
- facesConfig = FacesConfigFactory.eINSTANCE.createFacesConfigType();
- //create and add converters
- EList converters = facesConfig.getConverter();
- converters.add(createConverter("BigDecimal")); //$NON-NLS-1$
- converters.add(createConverter("BigInteger")); //$NON-NLS-1$
- converters.add(createConverter("Boolean")); //$NON-NLS-1$
- converters.add(createConverter("Byte")); //$NON-NLS-1$
- converters.add(createConverter("Character")); //$NON-NLS-1$
- converters.add(createConverter("DateTime")); //$NON-NLS-1$
- converters.add(createConverter("Double")); //$NON-NLS-1$
- converters.add(createConverter("Float")); //$NON-NLS-1$
- converters.add(createConverter("Integer")); //$NON-NLS-1$
- converters.add(createConverter("Long")); //$NON-NLS-1$
- converters.add(createConverter("Number")); //$NON-NLS-1$
- converters.add(createConverter("Short")); //$NON-NLS-1$
- //create and add validators
- EList validators = facesConfig.getValidator();
- validators.add(createValidator("DoubleRange")); //$NON-NLS-1$
- validators.add(createValidator("Length")); //$NON-NLS-1$
- validators.add(createValidator("LongRange")); //$NON-NLS-1$
- }
-
- /**
- * Creates a {@link ConverterType} instance.
- *
- * @param name Base name of converter from which converter-id and
- * converter-class are formed.
- * @return {@link ConverterType} instance.
- */
- protected ConverterType createConverter(String name) {
- ConverterType converterType = FacesConfigFactory.eINSTANCE.createConverterType();
- //set converter-id
- ConverterIdType converterIdType = FacesConfigFactory.eINSTANCE.createConverterIdType();
- StringBuffer sb = new StringBuffer();
- sb.append("javax.faces."); //$NON-NLS-1$
- sb.append(name);
- converterIdType.setTextContent(sb.toString());
- converterType.setConverterId(converterIdType);
- //set converter-class
- ConverterClassType converterClassType = FacesConfigFactory.eINSTANCE.createConverterClassType();
- sb = new StringBuffer();
- sb.append("javax.faces.convert."); //$NON-NLS-1$
- sb.append(name);
- sb.append("Converter"); //$NON-NLS-1$
- converterClassType.setTextContent(sb.toString());
- converterType.setConverterClass(converterClassType);
- return converterType;
- }
-
- /**
- * Creates a {@link ValidatorType} instance.
- *
- * @param name Base name of validator from which validator-id and
- * validator-class are formed.
- * @return {@link ValidatorType} instance.
- */
- protected ValidatorType createValidator(String name) {
- ValidatorType validatorType = FacesConfigFactory.eINSTANCE.createValidatorType();
- //set validator-id
- ValidatorIdType validatorIdType = FacesConfigFactory.eINSTANCE.createValidatorIdType();
- StringBuffer sb = new StringBuffer();
- sb.append("javax.faces."); //$NON-NLS-1$
- sb.append(name);
- validatorIdType.setTextContent(sb.toString());
- validatorType.setValidatorId(validatorIdType);
- //set validator-class
- ValidatorClassType validatorClassType = FacesConfigFactory.eINSTANCE.createValidatorClassType();
- sb = new StringBuffer();
- sb.append("javax.faces.validator."); //$NON-NLS-1$
- sb.append(name);
- sb.append("Validator"); //$NON-NLS-1$
- validatorClassType.setTextContent(sb.toString());
- validatorType.setValidatorClass(validatorClassType);
- return validatorType;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object otherObject) {
- boolean equals = false;
- if (otherObject instanceof ImplicitRuntimeJSFAppConfigProvider) {
- equals = true;
- }
- return equals;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return ImplicitRuntimeJSFAppConfigProvider.class.getName().hashCode();
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "ImplicitRuntimeJSFAppConfigProvider[]"; //$NON-NLS-1$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java
deleted file mode 100644
index 3b05dcb71..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.io.IOException;
-import java.util.Collections;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.Messages;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigResourceFactory;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-
-/**
- * JARFileJSFAppConfigProvider provides the root element of an application
- * configuration model by loading the model from a /META-INF/faces-config.xml
- * entry in a JAR file.
- *
- * @author Ian Trimble - Oracle
- */
-public class JARFileJSFAppConfigProvider extends AbstractJSFAppConfigProvider {
-
- /**
- * Prefix required to turn filename into a JAR URI.
- */
- public static final String JARFILE_URI_PREFIX = "jar:file:///";
-
- /**
- * Suffix required to turn filename into a JAR URI.
- */
- public static final String FACES_CONFIG_IN_JAR_SUFFIX = "!/META-INF/faces-config.xml";
-
- /**
- * Name of a JAR file that contains a /META-INF/faces-config.xml entry.
- */
- protected String filename = null;
-
- /**
- * Cached {@link FacesConfigType} instance.
- */
- protected FacesConfigType facesConfig = null;
-
- /**
- * Flag to track if load error has been logged at least once.
- */
- protected boolean loadErrorLogged = false;
-
- /**
- * Creates an instance, storing the passed IProject instance and file name
- * String to be used for subsequent processing.
- *
- * @param project IProject instance who's classpath contains this JAR file.
- * @param filename Name of a JAR file that contains a
- * /META-INF/faces-config.xml entry.
- */
- public JARFileJSFAppConfigProvider(String filename) {
- this.filename = filename;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#getFacesConfigModel()
- */
- public FacesConfigType getFacesConfigModel() {
- if (facesConfig == null) {
- if (filename != null) {
- StringBuffer sb = new StringBuffer();
- sb.append(JARFILE_URI_PREFIX);
- sb.append(filename);
- sb.append(FACES_CONFIG_IN_JAR_SUFFIX);
- URI jarFileURI = URI.createURI(sb.toString());
- FacesConfigResourceFactory resourceFactory = new FacesConfigResourceFactory(EMF2SAXRendererFactory.INSTANCE);
- Resource resource = resourceFactory.createResource(jarFileURI);
- try {
- resource.load(Collections.EMPTY_MAP);
- if (resource != null) {
- EList resourceContents = resource.getContents();
- if (resourceContents != null && resourceContents.size() > 0) {
- facesConfig = (FacesConfigType)resourceContents.get(0);
- if (facesConfig != null) {
- jsfAppConfigLocater.getJSFAppConfigManager().addFacesConfigChangeAdapter(facesConfig);
- }
- }
- }
- } catch(IllegalStateException ise) {
- //log error
- logLoadError(ise);
- } catch(IOException ioe) {
- //log error
- logLoadError(ioe);
- }
- }
- }
- return facesConfig;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.IJSFAppConfigProvider#releaseFacesConfigModel()
- */
- public void releaseFacesConfigModel() {
- jsfAppConfigLocater.getJSFAppConfigManager().removeFacesConfigChangeAdapter(facesConfig);
- }
-
- /**
- * Called to log a load error; load error will be logged once only per
- * instance, per VM session.
- *
- * @param ex Throwable instance to be logged.
- */
- protected void logLoadError(Throwable ex) {
- if (!loadErrorLogged) {
- JSFCorePlugin.log(
- IStatus.ERROR,
- NLS.bind(Messages.JARFileJSFAppConfigProvider_ErrorLoadingModel, JARFILE_URI_PREFIX + filename + FACES_CONFIG_IN_JAR_SUFFIX),
- ex);
- loadErrorLogged = true;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object otherObject) {
- boolean equals = false;
- if (otherObject != null && otherObject instanceof JARFileJSFAppConfigProvider) {
- String otherFilename = ((JARFileJSFAppConfigProvider)otherObject).filename;
- if (filename != null) {
- equals = filename.equals(otherFilename);
- } else {
- equals = otherFilename == null;
- }
- }
- return equals;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return filename != null ? filename.hashCode() : 0;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer sb = new StringBuffer("JARFileJSFAppConfigProvider["); //$NON-NLS-1$
- if (filename != null) {
- sb.append(filename);
- } else {
- sb.append("null"); //$NON-NLS-1$
- }
- sb.append("]"); //$NON-NLS-1$
- return sb.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigManager.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigManager.java
deleted file mode 100644
index eef1004f4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigManager.java
+++ /dev/null
@@ -1,723 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-
-/**
- * JSFAppConfigManager provides an entry point to an entire JSF application
- * configuration, which is defined in one or more application configuration
- * resource files.
- *
- * @author Ian Trimble - Oracle
- */
-public class JSFAppConfigManager implements IResourceChangeListener {
-
- /**
- * Key that is used for the IProject instance's session property that
- * holds a JSFAppConfigManager instance.
- */
- public static final QualifiedName KEY_SESSIONPROPERTY =
- new QualifiedName(JSFCorePlugin.PLUGIN_ID, "JSFAppConfigManager"); //$NON-NLS-1$
-
- /**
- * IProject instance to which this JSFAppConfigManager instance is keyed.
- */
- protected IProject project = null;
-
- /**
- * Collection of {@link IJSFAppConfigLocater} instances.
- */
- protected List configLocaters = null;
-
- /**
- * Collection of {@link IJSFAppConfigProvidersChangeListener} instances.
- */
- protected List configProvidersChangeListeners = null;
-
- /**
- * Map of application configuration model EMF classes to
- * {@link IFacesConfigChangeListener} instances.
- */
- protected Map facesConfigChangeListeners = null;
-
- /**
- * Single {@link FacesConfigChangeAdapter} instance.
- */
- protected FacesConfigChangeAdapter facesConfigChangeAdapter = null;
-
- /**
- * Gets a JSFAppConfigManager instance that is keyed to the passed IProject
- * parameter. May return null if the project is not valid or if a
- * CoreException is thrown while attempting to get or set the instance as
- * a session property.
- *
- * @param project IProject instance to which the returned
- * JSFAppConfigManager instance is keyed.
- * @return JSFAppConfigManager instance, or null.
- */
- public static JSFAppConfigManager getInstance(IProject project) {
- JSFAppConfigManager manager = null;
- if (JSFAppConfigUtils.isValidJSFProject(project)) {
- manager = getFromSessionProperty(project);
- if (manager == null) {
- manager = new JSFAppConfigManager(project);
- }
- }
- return manager;
- }
-
- /**
- * Attempts to get a JSFAppConfigManager instance from a session property
- * of the passed IProject instance. Will return null if the session
- * property has not yet been set.
- *
- * @param project IProject instance from which to retrieve the
- * JSFAppConfigManager instance.
- * @return JSFAppConfigManager instance, or null.
- */
- protected static JSFAppConfigManager getFromSessionProperty(IProject project) {
- JSFAppConfigManager manager = null;
- try {
- Object obj = project.getSessionProperty(KEY_SESSIONPROPERTY);
- if (obj != null && obj instanceof JSFAppConfigManager) {
- manager = (JSFAppConfigManager)obj;
- }
- } catch(CoreException ce) {
- //log error
- JSFCorePlugin.log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- }
- return manager;
- }
-
- /**
- * Sets this JSFAppConfigManager instance as a session property of its
- * IProject instance.
- */
- protected void setAsSessionProperty() {
- if (project != null && project.isAccessible()) {
- try {
- project.setSessionProperty(KEY_SESSIONPROPERTY, this);
- } catch(CoreException ce) {
- //log error
- JSFCorePlugin.log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- }
- }
- }
-
- /**
- * Unsets this JSFAppConfigManager instance as a session property of its
- * IProject instance.
- */
- protected void unsetAsSessionProperty() {
- if (project != null && project.isAccessible()) {
- try {
- project.setSessionProperty(KEY_SESSIONPROPERTY, null);
- } catch(CoreException ce) {
- //log error
- JSFCorePlugin.log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- }
- }
- }
-
- /**
- * Constructor is private to prevent direct instantiation; call
- * getInstance(IProject).
- *
- * @param project IProject instance to which the new JSFAppConfigManager
- * instance is keyed.
- */
- private JSFAppConfigManager(IProject project) {
- this.project = project;
- initialize();
- }
-
- /**
- * Gets this instance's IProject instance.
- *
- * @return This instance's IProject instance.
- */
- public IProject getProject() {
- return project;
- }
-
- /**
- * Initializes instance by:
- * <ul>
- * <li>creating facesConfigChangeListeners collection, </li>
- * <li>creating configProvidersChangeListeners collection, </li>
- * <li>creating and populating configLocaters collection, </li>
- * <li>invoking the startLocating() method on all configLocaters, </li>
- * <li>setting instance as a session property of the IProject instance, </li>
- * <li>adding a resource change listener to the workspace.</li>
- * </ul>
- */
- protected void initialize() {
- //create collections
- facesConfigChangeListeners = new HashMap();
- configProvidersChangeListeners = new ArrayList();
- configLocaters = new ArrayList();
- //populate initial set of locaters
- populateConfigLocaters();
- //instruct locaters to start locating
- startConfigLocaters();
- //set as session property of project
- setAsSessionProperty();
- //add resource change listener
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- workspace.addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- }
-
- /**
- * Populates configLocaters Set with "built-in" set of
- * {@link IJSFAppConfigLocater} implementations.
- */
- protected void populateConfigLocaters() {
- //implicit runtime-provided configuration
- IJSFAppConfigLocater implicitRuntimeConfigLocater = new ImplicitRuntimeJSFAppConfigLocater();
- implicitRuntimeConfigLocater.setJSFAppConfigManager(this);
- configLocaters.add(implicitRuntimeConfigLocater);
- //default ("/WEB-INF/faces-config.xml") locater
- IJSFAppConfigLocater defaultConfigLocater = new DefaultJSFAppConfigLocater();
- defaultConfigLocater.setJSFAppConfigManager(this);
- configLocaters.add(defaultConfigLocater);
- //web.xml context-parameter specified locater
- IJSFAppConfigLocater contextParamConfigLocater = new ContextParamSpecifiedJSFAppConfigLocater();
- contextParamConfigLocater.setJSFAppConfigManager(this);
- configLocaters.add(contextParamConfigLocater);
- //runtime classpath locater
- IJSFAppConfigLocater classpathConfigLocater = new RuntimeClasspathJSFAppConfigLocater();
- classpathConfigLocater.setJSFAppConfigManager(this);
- configLocaters.add(classpathConfigLocater);
- }
-
- /**
- * Instructs set of {@link IJSFAppConfigLocater} instances to start
- * locating JSF application configuration resources.
- */
- protected void startConfigLocaters() {
- Iterator itConfigLocaters = configLocaters.iterator();
- while (itConfigLocaters.hasNext()) {
- IJSFAppConfigLocater configLocater = (IJSFAppConfigLocater)itConfigLocaters.next();
- configLocater.startLocating();
- }
- }
-
- /**
- * Instructs set of {@link IJSFAppConfigLocater} instances to stop
- * locating JSF application configuration resources.
- */
- protected void stopConfigLocaters() {
- Iterator itConfigLocaters = configLocaters.iterator();
- while (itConfigLocaters.hasNext()) {
- IJSFAppConfigLocater configLocater = (IJSFAppConfigLocater)itConfigLocaters.next();
- configLocater.stopLocating();
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- if (delta.getKind() == IResourceDelta.CHANGED) {
- IResourceDelta[] removedDeltas = delta.getAffectedChildren(IResourceDelta.REMOVED);
- if (removedDeltas.length == 1) {
- IResourceDelta removedDelta = removedDeltas[0];
- IResource removedResource = removedDelta.getResource();
- if (removedResource != null && removedResource == project) {
- IResourceDelta[] addedDeltas = delta.getAffectedChildren(IResourceDelta.ADDED);
- if (addedDeltas.length == 1) {
- IResourceDelta addedDelta = addedDeltas[0];
- IResource addedResource = addedDelta.getResource();
- if (addedResource != null && addedResource instanceof IProject) {
- changeProject((IProject)addedResource);
- }
- }
- }
- }
- }
- }
-
- /**
- * Called to respond to a change in the IProject instance to which this
- * instance belongs. Changes the cached IProject instance, stops all config
- * locaters, starts all config locaters.
- *
- * @param newProject New IProject instance to which this manager belongs.
- */
- protected void changeProject(IProject newProject) {
- this.project = newProject;
- stopConfigLocaters();
- startConfigLocaters();
- }
-
- /**
- * Adds an instance of {@link IJSFAppConfigProvidersChangeListener}.
- *
- * @param listener An instance of {@link IJSFAppConfigProvidersChangeListener}.
- * @return true if added, else false.
- */
- public boolean addJSFAppConfigProvidersChangeListener(IJSFAppConfigProvidersChangeListener listener) {
- return configProvidersChangeListeners.add(listener);
- }
-
- /**
- * Removes an instance of {@link IJSFAppConfigProvidersChangeListener}.
- *
- * @param listener an instance of {@link IJSFAppConfigProvidersChangeListener}.
- * @return true if removed, else false.
- */
- public boolean removeJSFAppConfigProvidersChangeListener(IJSFAppConfigProvidersChangeListener listener) {
- return configProvidersChangeListeners.remove(listener);
- }
-
- /**
- * Notifies all {@link IJSFAppConfigProvidersChangeListener} instances of
- * a change in the Set of {@link IJSFAppConfigProvider} instances.
- *
- * @param configProvider {@link IJSFAppConfigProvider} instance that has
- * changed.
- * @param eventType Event type.
- */
- public void notifyJSFAppConfigProvidersChangeListeners(IJSFAppConfigProvider configProvider, int eventType) {
- JSFAppConfigProvidersChangeEvent event = new JSFAppConfigProvidersChangeEvent(configProvider, eventType);
- Iterator itListeners = configProvidersChangeListeners.iterator();
- while (itListeners.hasNext()) {
- IJSFAppConfigProvidersChangeListener listener =
- (IJSFAppConfigProvidersChangeListener)itListeners.next();
- listener.changedJSFAppConfigProviders(event);
- }
- }
-
- /**
- * Adds an instance of {@link IFacesConfigChangeListener}. <br>
- * <br>
- * <b>NOTE:</b> Calling this method will cause all application
- * configuration models to be loaded, to ensure that a
- * {@link FacesConfigChangeAdapter} has been added to each model.
- *
- * @param emfClass EMF class in which the listener is interested.
- * @param listener {@link IFacesConfigChangeListener} instance.
- * @return Previous {@link IFacesConfigChangeListener}, or null.
- */
- public Object addFacesConfigChangeListener(Class emfClass, IFacesConfigChangeListener listener) {
- /*
- * Get all models, which will ensure that each one has had a
- * FacesConfigChangeAdapter added to it.
- */
- getFacesConfigModels();
- return facesConfigChangeListeners.put(emfClass, listener);
- }
-
- /**
- * Removes an instance of {@link IFacesConfigChangeListener}.
- *
- * @param emfClass EMF class in which the listener was interested.
- * @return Removed {@link IFacesConfigChangeListener}, or null.
- */
- public Object removeFacesConfigChangeListener(Class emfClass) {
- return facesConfigChangeListeners.remove(emfClass);
- }
-
- /**
- * Notifies {@link IFacesConfigChangeListener} instances of model changes
- * in which they registered interest.
- *
- * @param notification EMF {@link Notification} instance that describes the
- * model change.
- */
- public void notifyFacesConfigChangeListeners(Notification notification) {
- Object emfFeature = notification.getFeature();
- if (emfFeature != null && emfFeature instanceof EStructuralFeature) {
- Class emfClass = ((EStructuralFeature)emfFeature).getEType().getInstanceClass();
- IFacesConfigChangeListener listener = (IFacesConfigChangeListener)facesConfigChangeListeners.get(emfClass);
- if (listener != null) {
- listener.notifyChanged(notification);
- }
- }
- }
-
- /**
- * Gets all {@link IJSFAppConfigProvider} instances from all
- * {@link IJSFAppConfigLocater} instances.
- *
- * @return Set of all {@link IJSFAppConfigProvider} instances.
- */
- public Set getJSFAppConfigProviders() {
- Set allConfigProviders = new LinkedHashSet();
- Iterator itConfigLocaters = configLocaters.iterator();
- while (itConfigLocaters.hasNext()) {
- IJSFAppConfigLocater configLocater = (IJSFAppConfigLocater)itConfigLocaters.next();
- allConfigProviders.addAll(configLocater.getJSFAppConfigProviders());
- }
- return allConfigProviders;
- }
-
- /**
- * Gets all {@link FacesConfigType} instances from all
- * {@link IJSFAppConfigProvider} instances.
- *
- * @return List of all {@link FacesConfigType} instances.
- */
- public List getFacesConfigModels() {
- List facesConfigModels = new ArrayList();
- Iterator itConfigProviders = getJSFAppConfigProviders().iterator();
- while (itConfigProviders.hasNext()) {
- IJSFAppConfigProvider configProvider = (IJSFAppConfigProvider)itConfigProviders.next();
- FacesConfigType facesConfig = configProvider.getFacesConfigModel();
- if (facesConfig != null) {
- facesConfigModels.add(facesConfig);
- }
- }
- return facesConfigModels;
- }
-
- /*
- * (non-Javadoc)
- * @see java.lang.Object#finalize()
- */
- protected void finalize() {
- //remove resource change listener
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- workspace.removeResourceChangeListener(this);
- //remove session property from project
- unsetAsSessionProperty();
- //instruct locaters to stop locating
- stopConfigLocaters();
- //clear collections
- configLocaters.clear();
- configProvidersChangeListeners.clear();
- facesConfigChangeListeners.clear();
- }
-
- /**
- * Gets list of all ManagedBeanType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all ManagedBeanType instances from all known
- * faces-config models (list may be empty).
- */
- public List getManagedBeans() {
- List allManagedBeans = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList managedBeans = facesConfig.getManagedBean();
- allManagedBeans.addAll(managedBeans);
- }
- return allManagedBeans;
- }
-
- /**
- * Gets list of all ValidatorType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all ValidatorType instances from all known faces-config
- * models (list may be empty).
- */
- public List getValidators() {
- List allValidators = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList validators = facesConfig.getValidator();
- allValidators.addAll(validators);
- }
- return allValidators;
- }
-
- /**
- * Gets list of all ConverterType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all ConverterType instances from all known faces-config
- * models (list may be empty).
- */
- public List getConverters() {
- List allConverters = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList converters = facesConfig.getConverter();
- allConverters.addAll(converters);
- }
- return allConverters;
- }
-
- /**
- * Gets list of all NavigationRuleType instances from all known
- * faces-config models; list may be empty.
- *
- * @return List of all NavigationRuleType instances from all known
- * faces-config models (list may be empty).
- */
- public List getNavigationRules() {
- List allNavigationRules = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList navigationRules = facesConfig.getNavigationRule();
- allNavigationRules.addAll(navigationRules);
- }
- return allNavigationRules;
- }
-
- /**
- * Gets list of all NavigationRuleType instances from all known
- * faces-config models where the navigation-rule's from-view-id value
- * matches the web content folder-relative value of the passed IFile
- * instance; list may be empty. Matching is performed in the same manner
- * as for a JSF implementation's default NavigationHandler.
- *
- * @param pageFile IFile instance to match against the from-view-id value
- * of all NavigationRuleType instances. File is assumed to be relative to
- * the web content folder, but may be expressed in a more complete form;
- * its path will be calculated relative to the web content folder.
- * @return List of all NavigationRuleType instances from all known
- * faces-config models where the navigation-rule's from-view-id value
- * matches the web content folder-relative value of the passed IFile
- * instance (list may be empty).
- */
- public List getNavigationRulesForPage(IFile pageFile) {
- List navigationRulesForPage = new ArrayList();
- IPath pageFilePath = JSFAppConfigUtils.getWebContentFolderRelativePath(pageFile);
- if (pageFilePath != null) {
- String pageFileString = pageFilePath.toString();
- if (!pageFileString.startsWith("/")) {
- pageFileString = "/" + pageFileString;
- }
- List navigationRules = getNavigationRules();
- Iterator itNavigationRules = navigationRules.iterator();
- while (itNavigationRules.hasNext()) {
- NavigationRuleType navigationRule = (NavigationRuleType)itNavigationRules.next();
- FromViewIdType fromViewIdType = navigationRule.getFromViewId();
- if (fromViewIdType != null) {
- String fromViewId = fromViewIdType.getTextContent();
- if (fromViewId != null && fromViewId.length() > 0) {
- if (!fromViewId.equals("*")) { //$NON-NLS-1$
- if (fromViewId.equals(pageFileString)) {
- //exact match
- navigationRulesForPage.add(navigationRule);
- } else if (fromViewId.endsWith("*")) { //$NON-NLS-1$
- String prefixFromViewId = fromViewId.substring(0, fromViewId.length() - 1);
- if (pageFileString.startsWith(prefixFromViewId)) {
- //prefix match
- navigationRulesForPage.add(navigationRule);
- }
- }
- } else {
- //from-view-id == "*" - matches all pages
- navigationRulesForPage.add(navigationRule);
- }
- }
- } else {
- //no from-view-id element - matches all pages
- navigationRulesForPage.add(navigationRule);
- }
- }
- }
- return navigationRulesForPage;
- }
-
- /**
- * Gets list of all ApplicationType instances from all known
- * faces-config models; list may be empty.
- *
- * @return List of all ApplicationType instances from all known
- * faces-config models (list may be empty).
- */
- public List getApplications() {
- List allApplications = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList applications = facesConfig.getApplication();
- allApplications.addAll(applications);
- }
- return allApplications;
- }
-
- /**
- * Gets list of all FactoryType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all FactoryType instances from all known faces-config
- * models (list may be empty).
- */
- public List getFactories() {
- List allFactories = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList factories = facesConfig.getFactory();
- allFactories.addAll(factories);
- }
- return allFactories;
- }
-
- /**
- * Gets list of all ComponentType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all ComponentType instances from all known faces-config
- * models (list may be empty).
- */
- public List getComponents() {
- List allComponents = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList components = facesConfig.getComponent();
- allComponents.addAll(components);
- }
- return allComponents;
- }
-
- /**
- * Gets list of all ReferencedBeanType instances from all known
- * faces-config models; list may be empty.
- *
- * @return List of all ReferencedBeanType instances from all known
- * faces-config models (list may be empty).
- */
- public List getReferencedBeans() {
- List allReferencedBeans = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList referencedBeans = facesConfig.getReferencedBean();
- allReferencedBeans.addAll(referencedBeans);
- }
- return allReferencedBeans;
- }
-
- /**
- * Gets list of all RenderKitType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all RenderKitType instances from all known faces-config
- * models (list may be empty).
- */
- public List getRenderKits() {
- List allRenderKits = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList renderKits = facesConfig.getRenderKit();
- allRenderKits.addAll(renderKits);
- }
- return allRenderKits;
- }
-
- /**
- * Gets list of all LifecycleType instances from all known faces-config
- * models; list may be empty.
- *
- * @return List of all LifecycleType instances from all known faces-config
- * models (list may be empty).
- */
- public List getLifecycles() {
- List allLifecycles = new ArrayList();
- List facesConfigs = getFacesConfigModels();
- Iterator itFacesConfigs = facesConfigs.iterator();
- while (itFacesConfigs.hasNext()) {
- FacesConfigType facesConfig = (FacesConfigType)itFacesConfigs.next();
- EList lifecycles = facesConfig.getLifecycle();
- allLifecycles.addAll(lifecycles);
- }
- return allLifecycles;
- }
-
- /**
- * Adds this instance's {@link FacesConfigChangeAdapter} instance to the
- * passed application configuration model's adapters collection.
- *
- * @param facesConfig Application configuration model's root object.
- */
- public void addFacesConfigChangeAdapter(FacesConfigType facesConfig) {
- if (facesConfig != null) {
- if (facesConfigChangeAdapter == null) {
- facesConfigChangeAdapter = new FacesConfigChangeAdapter();
- }
- facesConfig.eAdapters().add(facesConfigChangeAdapter);
- }
- }
-
- /**
- * Removes this instance's {@link FacesConfigChangeAdapter} instance from
- * the passed application configuration model's adapters collection.
- *
- * @param facesConfig Application configuration model's root object.
- */
- public void removeFacesConfigChangeAdapter(FacesConfigType facesConfig) {
- if (facesConfig != null && facesConfigChangeAdapter != null) {
- facesConfig.eAdapters().remove(facesConfigChangeAdapter);
- }
- }
-
- /**
- * FacesConfigChangeAdapter is an EMF adapter which provides a mechanism
- * for notification of changes to features in any application configuration
- * model for which {@link IFacesConfigChangeListener} instances have
- * registered an interest.
- *
- * @author Ian Trimble - Oracle
- */
- class FacesConfigChangeAdapter extends EContentAdapter {
- /*
- * (non-Javadoc)
- * @see org.eclipse.emf.ecore.util.EContentAdapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- notifyFacesConfigChangeListeners(notification);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigProvidersChangeEvent.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigProvidersChangeEvent.java
deleted file mode 100644
index 138b12679..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigProvidersChangeEvent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-/**
- * JSFAppConfigProvidersChangeEvent provides change information to instances of
- * IJSFAppConfigProvidersChangeListener.
- *
- * @author Ian Trimble - Oracle
- */
-public class JSFAppConfigProvidersChangeEvent {
-
- /**
- * Event type; instance of IJSFAppConfigProvider was added (value == 1).
- */
- public static final int ADDED = 1;
-
- /**
- * Event type; instance of IJSFAppConfigProvider was removed (value == 2).
- */
- public static final int REMOVED = 2;
-
- /**
- * Instance of IJSFAppConfigProvider that was added or removed.
- */
- protected IJSFAppConfigProvider configProvider = null;
-
- /**
- * Event type.
- */
- protected int eventType;
-
- /**
- * Constructs an instance.
- *
- * @param configProvider Instance of IJSFAppConfigProvider that was added
- * or removed
- * @param eventType Event type
- */
- public JSFAppConfigProvidersChangeEvent(IJSFAppConfigProvider configProvider, int eventType) {
- this.configProvider = configProvider;
- this.eventType = eventType;
- }
-
- /**
- * Gets the instance of IJSFAppConfigProvider that was added or removed.
- *
- * @return Instance of IJSFAppConfigProvider that was added or removed
- */
- public IJSFAppConfigProvider getJSFAppConfigProvider() {
- return configProvider;
- }
-
- /**
- * Gets the event type.
- *
- * @return Event type
- */
- public int getEventType() {
- return eventType;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigUtils.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigUtils.java
deleted file mode 100644
index 57144a299..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigUtils.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * JSFAppConfigUtils provides utility methods useful in processing of a JSF
- * application configuration.
- *
- * @author Ian Trimble - Oracle
- */
-public class JSFAppConfigUtils {
-
- /**
- * Name of JSF CONFIG_FILES context parameter ("javax.faces.CONFIG_FILES").
- */
- public static final String CONFIG_FILES_CONTEXT_PARAM_NAME = "javax.faces.CONFIG_FILES";
-
- /**
- * Location in JAR file of application configuration resource file
- * ("META-INF/faces-config.xml").
- */
- public static final String FACES_CONFIG_IN_JAR_PATH = "META-INF/faces-config.xml";
-
- /**
- * Tests if the passed IProject instance is a valid JSF project in the
- * following ways:
- * <ul>
- * <li>project is not null and is accessible, </li>
- * <li>project has the "jst.jsf" facet set on it.</li>
- * </ul>
- *
- * @param project IProject instance to be tested.
- * @return true if the IProject instance is a valid JSF project, else
- * false.
- */
- public static boolean isValidJSFProject(IProject project) {
- boolean isValid = false;
- //check for null or inaccessible project
- if (project != null && project.isAccessible()) {
- //check for "jst.jsf" facet on project
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject != null) {
- Set projectFacets = facetedProject.getProjectFacets();
- Iterator itProjectFacets = projectFacets.iterator();
- while (itProjectFacets.hasNext()) {
- IProjectFacetVersion projectFacetVersion = (IProjectFacetVersion)itProjectFacets.next();
- IProjectFacet projectFacet = projectFacetVersion.getProjectFacet();
- if ("jst.jsf".equals(projectFacet.getId())) { //$NON-NLS-1$
- isValid = true;
- break;
- }
- }
- }
- } catch(CoreException ce) {
- //log error
- JSFCorePlugin.log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- }
- }
- return isValid;
- }
-
- /**
- * Gets an IVirtualFolder instance which represents the root context's
- * web content folder.
- *
- * @param project IProject instance for which to get the folder.
- * @return IVirtualFolder instance which represents the root context's
- * web content folder.
- */
- public static IVirtualFolder getWebContentFolder(IProject project) {
- IVirtualFolder folder = null;
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
- folder = component.getRootFolder();
- }
- return folder;
- }
-
- /**
- * Gets an IPath instance representing the path of the passed IFile
- * instance relative to the web content folder.
- *
- * @param file IFile instance for which a path is required.
- * @return IPath instance representing the path relative to the web content
- * folder.
- */
- public static IPath getWebContentFolderRelativePath(IFile file) {
- IPath path = null;
- if (file != null) {
- IVirtualFolder webContentFolder = getWebContentFolder(file.getProject());
- if (webContentFolder != null) {
- IPath webContentPath = webContentFolder.getProjectRelativePath();
- IPath filePath = file.getProjectRelativePath();
- int matchingFirstSegments = webContentPath.matchingFirstSegments(filePath);
- path = filePath.removeFirstSegments(matchingFirstSegments);
- }
- }
- return path;
- }
-
- /**
- * Gets list of application configuration file names as listed in the JSF
- * CONFIG_FILES context parameter ("javax.faces.CONFIG_FILES"). Will return
- * an empty list if WebArtifactEdit is null, if WebApp is null, if context
- * parameter does not exist, or if trimmed context parameter's value is
- * an empty String.
- *
- * @param project IProject instance for which to get the context
- * parameter's value.
- * @return List of application configuration file names as listed in the
- * JSF CONFIG_FILES context parameter ("javax.faces.CONFIG_FILES"); list
- * may be empty.
- */
- public static List getConfigFilesFromContextParam(IProject project) {
- ArrayList filesList = new ArrayList();
- if (isValidJSFProject(project)) {
- WebArtifactEdit webArtifactEdit = WebArtifactEdit.getWebArtifactEditForRead(project);
- if (webArtifactEdit != null) {
- WebApp webApp = null;
- try {
- webApp = webArtifactEdit.getWebApp();
- } catch(ClassCastException cce) {
- //occasionally thrown from WTP code in RC3 and possibly later
- JSFCorePlugin.log(IStatus.ERROR, cce.getLocalizedMessage(), cce);
- return filesList;
- }
- if (webApp != null) {
- String filesString = null;
- //need to branch here due to model version differences (BugZilla #119442)
- if (webApp.getVersionID() == J2EEVersionConstants.WEB_2_3_ID) {
- EList contexts = webApp.getContexts();
- Iterator itContexts = contexts.iterator();
- while (itContexts.hasNext()) {
- ContextParam contextParam = (ContextParam)itContexts.next();
- if (contextParam.getParamName().equals(CONFIG_FILES_CONTEXT_PARAM_NAME)) {
- filesString = contextParam.getParamValue();
- break;
- }
- }
- } else {
- EList contextParams = webApp.getContextParams();
- Iterator itContextParams = contextParams.iterator();
- while (itContextParams.hasNext()) {
- ParamValue paramValue = (ParamValue)itContextParams.next();
- if (paramValue.getName().equals(CONFIG_FILES_CONTEXT_PARAM_NAME)) {
- filesString = paramValue.getValue();
- break;
- }
- }
- }
- if (filesString != null && filesString.trim().length() > 0) {
- StringTokenizer stFilesString = new StringTokenizer(filesString, ",");
- while (stFilesString.hasMoreTokens()) {
- String configFile = stFilesString.nextToken().trim();
- filesList.add(configFile);
- }
- }
- }
- webArtifactEdit.dispose();
- }
- }
- return filesList;
- }
-
- /**
- * Gets list of JAR file names, where each file name represents a JAR on
- * the classpath that contains a /META-INF/faces-config.xml entry. Will
- * return an empty list if no such JAR files are located.
- *
- * @param project IProject instance for which to scan the classpath.
- * @return List of JAR file names, where each file name represents a JAR
- * on the classpath that contains a ...META-INF/faces-config.xml entry;
- * list may be empty.
- * @throws CoreException Thrown when underlying calls into JavaCore fail.
- * @throws IOException Thrown when attempt to open JAR to determine if it
- * contains a /META-INF/faces-config.xml entry fails.
- */
- public static List getConfigFileJARsFromClasspath(IProject project) throws CoreException, IOException {
- ArrayList JARsList = new ArrayList();
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IClasspathEntry[] classpathEntries = javaProject.getResolvedClasspath(true);
- if (classpathEntries != null && classpathEntries.length > 0) {
- for (int i = 0; i < classpathEntries.length; i++) {
- IClasspathEntry classpathEntry = classpathEntries[i];
- if (classpathEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IPath libraryPath = classpathEntry.getPath();
- if (libraryPath.getFileExtension() != null && libraryPath.getFileExtension().length() > 0) {
- //TODO: find better way to determine if workspace must be prepended to path
- if (libraryPath.getDevice() == null) {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- IPath workspaceRootPath = workspaceRoot.getLocation();
- libraryPath = workspaceRootPath.append(libraryPath);
- }
- String libraryPathString = libraryPath.toString();
- JarFile jarFile = null;
- try {
- jarFile = new JarFile(libraryPathString);
- if (jarFile != null) {
- JarEntry jarEntry = jarFile.getJarEntry(FACES_CONFIG_IN_JAR_PATH);
- if (jarEntry != null) {
- JARsList.add(libraryPathString);
- }
- }
- } catch(IOException ioe) {
- JSFCorePlugin.log(
- IStatus.ERROR,
- NLS.bind(Messages.JSFAppConfigUtils_ErrorOpeningJarFile, libraryPathString),
- ioe);
- } finally {
- if (jarFile != null) {
- jarFile.close();
- }
- }
- }
- }
- }
- }
- }
- }
- return JARsList;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java
deleted file mode 100644
index 0854498a1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-
-/**
- * RuntimeClasspathJSFAppConfigLocater attempts to locate application
- * configuration files in JAR files on the runtime classpath. The runtime
- * classpath includes the server runtime classpath and the JAR files that will
- * be deployed to the web application's /WEB-INF/lib folder.
- *
- * @author Ian Trimble - Oracle
- */
-public class RuntimeClasspathJSFAppConfigLocater extends AbstractJSFAppConfigLocater
- implements IElementChangedListener {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#startLocating()
- */
- public void startLocating() {
- locateProviders();
- JavaCore.addElementChangedListener(this);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.AbstractJSFAppConfigLocater#stopLocating()
- */
- public void stopLocating() {
- JavaCore.removeElementChangedListener(this);
- }
-
- /**
- * Locates application configuration resources specified in JAR files on
- * the runtime classpath, and updates the set of
- * {@link IJSFAppConfigProvider} instances accordingly.
- */
- public void locateProviders() {
- try {
- List JARs = JSFAppConfigUtils.getConfigFileJARsFromClasspath(manager.getProject());
- Iterator itJARs = JARs.iterator();
- Set newConfigProviders = new LinkedHashSet();
- while (itJARs.hasNext()) {
- String JARFilename = (String)itJARs.next();
- JARFileJSFAppConfigProvider configProvider = new JARFileJSFAppConfigProvider(JARFilename);
- newConfigProviders.add(configProvider);
- }
- updateConfigProviders(newConfigProviders);
- } catch(CoreException ce) {
- //log error
- JSFCorePlugin.log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- } catch(IOException ioe) {
- //log error
- JSFCorePlugin.log(IStatus.ERROR, ioe.getLocalizedMessage(), ioe);
- }
- }
-
- /**
- * Called when a Java element has changed.
- *
- * @param event ElementChangedEvent instance describing the change.
- */
- public void elementChanged(ElementChangedEvent event) {
- if (classpathChanged(event.getDelta())) {
- locateProviders();
- }
- }
-
- /**
- * Recursively tests if the passed IJavaElementDelta instance or any of its
- * descendents indicate a classpath change has occurred.
- *
- * @param delta IJavaElement instance to be tested.
- * @return true if a claspath change has occurred, else false.
- */
- protected boolean classpathChanged(IJavaElementDelta delta) {
- int deltaFlags = delta.getFlags();
- if (((deltaFlags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) == IJavaElementDelta.F_ADDED_TO_CLASSPATH) ||
- ((deltaFlags & IJavaElementDelta.F_ARCHIVE_CONTENT_CHANGED) == IJavaElementDelta.F_ARCHIVE_CONTENT_CHANGED) ||
- ((deltaFlags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) == IJavaElementDelta.F_REMOVED_FROM_CLASSPATH)) {
- return true;
- } else {
- boolean changed = false;
- IJavaElementDelta[] childDeltas = delta.getAffectedChildren();
- if (childDeltas != null) {
- for (int i = 0; i < childDeltas.length; i++) {
- if (classpathChanged(childDeltas[i])) {
- changed = true;
- break;
- }
- }
- }
- return changed;
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java
deleted file mode 100644
index 380b7ac20..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig;
-
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * WebContentRelativeJSFAppConfigLocater is an abstract base class that
- * attempts to locate specified application configuration files relative to a
- * web content folder. Subclasses must override the getFilenames() method to
- * return a list of filenames that the locateProviders() method will attempt to
- * locate, and call locateProviders().
- *
- * @author Ian Trimble - Oracle
- */
-public abstract class WebContentRelativeJSFAppConfigLocater extends AbstractJSFAppConfigLocater {
-
- /**
- * Locates application configuration resources specified by the filenames
- * (relative to the web content folder) returned by getFilenames(), and
- * updates the set of {@link IJSFAppConfigProvider} instances accordingly.
- */
- public void locateProviders() {
- IProject project = manager.getProject();
- IVirtualFolder webContentFolder = JSFAppConfigUtils.getWebContentFolder(project);
- if (webContentFolder != null) {
- List filenames = getFilenames();
- Iterator itFilenames = filenames.iterator();
- Set newConfigProviders = new LinkedHashSet();
- while (itFilenames.hasNext()) {
- String filename = (String)itFilenames.next();
- IVirtualResource appConfigResource = webContentFolder.findMember(filename);
- if (appConfigResource != null && appConfigResource.getType() == IVirtualResource.FILE) {
- IFile file = (IFile)appConfigResource.getUnderlyingResource();
- if (file != null && file.exists()) {
- ArtifactEditJSFAppConfigProvider configProvider = new ArtifactEditJSFAppConfigProvider(file);
- newConfigProviders.add(configProvider);
- }
- }
- }
- updateConfigProviders(newConfigProviders);
- }
- }
-
- /**
- * Gets a list of Strings representing the filenames (relative to the web
- * content folder) that locateProviders() will attempt to locate.
- *
- * @return A list of Strings representing the filenames (relative to the
- * web content folder) that locateProviders() will attempt to locate.
- */
- protected abstract List getFilenames();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/InvalidArchiveFilesCreationException.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/InvalidArchiveFilesCreationException.java
deleted file mode 100644
index 4fff63329..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/InvalidArchiveFilesCreationException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry;
-
-/**
- * Exception class thrown by PluginProvidedJSFLibraryCreationHelper.
- *
- * @author Gerry Kessler - Oracle
- */
-public class InvalidArchiveFilesCreationException extends Exception {
- private static final long serialVersionUID = 1L;
-
- /**
- * Creates an instance with the specified message.
- * @param msg This instance's message
- */
- public InvalidArchiveFilesCreationException(String msg) {
- super(msg);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java
deleted file mode 100644
index eba6170ab..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.osgi.framework.Bundle;
-
-/**
- * Abstract delegate class used by jsfLibraries ext-pt to return collection of
- * ArchiveFiles to PluginProvidedJSFLibraryCreationHelper.
- *
- * Caller must first setConfigurationElement(IConfigurationElement element)
- * before a call to getArchiveFiles().
- * <br>
- * <em><b>NOTE: experimental and very likely to change.</b></em>
- *
- * @author Gerry Kessler - Oracle
- */
-public abstract class JSFLibraryArchiveFilesDelegate {
-
- protected IConfigurationElement extPtElement;
- private String libID = null;
- private IPath pluginPath = null;
- private String pluginID;
- private String relativeDestLocation = "WEB-INF/lib"; //$NON-NLS-1$
-
- /**
- * Returns a Collection of <code>org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile</code>
- * instances.
- *
- * @return A Collection of <code>org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile</code>
- * instances
- */
- public abstract Collection getArchiveFiles();
-
- /**
- * Sets the IConfigurationElement instance to be subsequently used to get
- * the plugin ID and the name defined for the JSF Library.
- *
- * @param extPtElement IConfigurationElement instance
- */
- public final void setConfigurationElement(IConfigurationElement extPtElement){
- this.extPtElement = extPtElement;
- }
-
- /**
- * Constructs an instance.
- */
- public JSFLibraryArchiveFilesDelegate() {
- super();
- }
-
- /**
- * Sets the relative destination location subsequently used to set the
- * corresponding property on each created ArchiveFile.
- *
- * @param relPath Relative destination location for ArchiveFile instances
- */
- protected void setRelativeDestinationLocation(String relPath){
- relativeDestLocation = relPath;
- }
-
- /**
- * Returns ArchiveFile where the location is set relative to the plugin.
- * As long as the ArchiveFile is on the local machine somewhere, it should
- * be locatable.
- *
- * @param relativePathFileName Relative location of the ArchiveFile
- * @return ArchiveFile instance.
- */
- protected ArchiveFile createArchiveFile(String relativePathFileName){
- ArchiveFile file = JSFLibraryRegistryFactory.eINSTANCE.createArchiveFile();
- file.setRelativeToWorkspace(false);
- file.setSourceLocation(relativePathFileName);
- file.setRelativeDestLocation(relativeDestLocation);
- return file;
- }
-
-// protected ArchiveFile createArchiveFileWithAbsolutePath(String fullPath){
-// ArchiveFile file = JSFLibraryRegistryFactory.eINSTANCE.createArchiveFile();
-// file.setRelativeToWorkspace(false);
-// file.setSourceLocation(fullPath);
-// file.setRelativeDestLocation(relativeDestLocation);
-// return file;
-// }
-
- /**
- * Returns the JSFLibrary ID as set on the extension point.
- *
- * @return JSFLibrary ID
- */
- protected String getLibID(){
- if (libID == null){
- StringBuffer buf = new StringBuffer(getPluginID());
- buf.append("/").append(extPtElement.getAttribute(PluginProvidedJSFLibraryCreationHelper.NAME)); //$NON-NLS-1$
- libID = buf.toString();
- }
- return libID;
- }
-
- /**
- * Returns the plugin's path.
- *
- * @return The plugin's path.
- */
- protected IPath getPluginPath(){
- if (pluginPath == null){
- Bundle bundle = Platform.getBundle(getPluginID());
- pluginPath = new Path(bundle.getLocation());
- }
- return pluginPath;
- }
-
- /**
- * Returns the plugin's ID.
- *
- * @return The plugin's ID.
- */
- private String getPluginID() {
- if (pluginID == null){
- pluginID = extPtElement.getDeclaringExtension().getNamespace();
- }
- return pluginID;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java
deleted file mode 100644
index 55424f109..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.Messages;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Helper class used to create JSF Libraries from the
- * <code>org.eclipse.jst.jsf.core.jsflibraries</code> extension-point.
- * <br>
- * <em><b>NOTE: experimental and very likely to change.</b></em>
- *
- * @author Gerry Kessler - Oracle
- */
-public final class PluginProvidedJSFLibraryCreationHelper {
- private IConfigurationElement config_element;
-
- /**
- * Key of the 'name' attribute of the extension point.
- */
- public final static String NAME = "name"; //$NON-NLS-1$
- /**
- * Key of the 'isImplementation' attribute of the extension point.
- */
- public final static String IS_IMPL = "isImplementation"; //$NON-NLS-1$
- /**
- * Key of the 'maxVersionSupported' attribute of the extension point.
- */
- public final static String VERSION = "maxVersionSupported"; //$NON-NLS-1$
- /**
- * Key of the 'archiveFilesDelegate' attribute of the extension point.
- */
- public final static String DELEGATE = "archiveFilesDelegate"; //$NON-NLS-1$
-
- /**
- * Creates an instance with the specified IConfigurationElement instance.
- *
- * @param jsfLibrary IConfigurationElement instance
- */
- public PluginProvidedJSFLibraryCreationHelper (IConfigurationElement jsfLibrary){
- this.config_element = jsfLibrary;
- }
-
- /**
- * Creates a new PluginProvidedJSFLibrary from the JSFLibrary extension point.
- *
- * @return PluginProvidedJSFLibrary instance.
- */
- public JSFLibrary create(){
- PluginProvidedJSFLibrary newLib = JSFLibraryRegistryFactory.eINSTANCE.createPluginProvidedJSFLibrary();
- newLib.setID(getLibID());
- newLib.setPluginID(getPluginID());
- newLib.setName(config_element.getAttribute(NAME));
- newLib.setImplementation(config_element.getAttribute(IS_IMPL).equals("true") ? true : false); //$NON-NLS-1$
- newLib.setJSFVersion(JSFVersion.getJSFVersion(config_element.getAttribute(VERSION)));
-
- try {
- addArchives(newLib);
- return newLib;
- } catch (Exception e) {
- JSFCorePlugin.log(
- e,
- NLS.bind(
- Messages.PluginProvidedJSFLibraryCreationHelper_ErrorCreating,
- newLib.getName()));
- }
- return null;
- }
-
- /**
- * Adds ArchiveFile instances to the specified JSFLibrary instance.
- *
- * @param newLib JSFLibrary instance
- * @throws InvalidArchiveFilesCreationException on attempt to create
- * multiple instances at same location.
- * @throws CoreException on core failure.
- */
- private void addArchives(JSFLibrary newLib) throws InvalidArchiveFilesCreationException, CoreException {
- JSFLibraryArchiveFilesDelegate jarCol = null;
- ArchiveFile jar = null;
-
- jarCol = (JSFLibraryArchiveFilesDelegate)config_element.createExecutableExtension(DELEGATE);
- if (jarCol != null){
- jarCol.setConfigurationElement(config_element);
- Collection jars = jarCol.getArchiveFiles();
- if (jars == null)//TODO: better validation and error handling
- return;
- Iterator it = jars.iterator();
- while (it.hasNext()){
- Object aJar = it.next();
- if (aJar instanceof ArchiveFile){//for now check to see ArchiveFiles were being returned
- jar = (ArchiveFile)aJar;
- if (!newLib.containsArchiveFile(jar.getSourceLocation()))
- newLib.getArchiveFiles().add(jar);
- }
- else {
- throw new InvalidArchiveFilesCreationException(
- NLS.bind(
- Messages.PluginProvidedJSFLibraryCreationHelper_ErrorMultipleDefinition,
- jar.getSourceLocation(),
- config_element.getName()));
- }
-
- }
- }
- }
-
- /**
- * Returns the JSFLibrary instance's ID as specified in the plugin.
- *
- * @return The JSFLibrary instance's ID
- */
- private String getLibID(){
- StringBuffer buf = new StringBuffer(config_element.getDeclaringExtension().getUniqueIdentifier());
- buf.append("/").append(config_element.getAttribute(NAME)); //$NON-NLS-1$
- return buf.toString();
- }
-
- /**
- * Returns the plugin's ID.
- *
- * @return The plugin's ID
- */
- private String getPluginID() {
- return config_element.getDeclaringExtension().getNamespace();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/BooleanLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/BooleanLiteralType.java
deleted file mode 100644
index 0309e0649..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/BooleanLiteralType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Represents a BooleanLiteral as defined by JSP.2.9
- *
- * @author cbateman
- *
- */
-public class BooleanLiteralType extends LiteralType
-{
- /**
- * The literal FALSE singleton
- */
- public final static BooleanLiteralType FALSE = new BooleanLiteralType(false);
- /**
- * The literal TRUE singleton
- */
- public final static BooleanLiteralType TRUE = new BooleanLiteralType(true);
-
- private final boolean _literalValue;
-
- /**
- * @param literalValue
- */
- /*package*/BooleanLiteralType(boolean literalValue)
- {
- super(Signature.SIG_BOOLEAN);
- _literalValue = literalValue;
- }
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- // illegal to coerce boolean to number per JSP.2.8.3 step 3
- throw new TypeCoercionException("Cannot coerce boolean to number");
- }
-
- public String getLiteralValue()
- {
- return Boolean.toString(_literalValue);
- }
-
- public Boolean coerceToBoolean() throws TypeCoercionException
- {
- return Boolean.valueOf(_literalValue);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeType.java
deleted file mode 100644
index a8324f240..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-
-/**
- * Encapsulates the runtime type or types of a JSF entity in a
- * way that can be compared to other entities
- *
- * @author cbateman
- *
- */
-public class CompositeType
-{
- private final String[] _signatures;
- private final int _assignmentType;
-
- private boolean[] _isTypeSignature; // = null lazily derived from signatures
- // on first access
- /**
- * @param signatureStrings
- * @param assignmentType
- */
- public CompositeType(String[] signatureStrings, int assignmentType)
- {
- if (signatureStrings == null
- || signatureStrings.length < 1)
- {
- throw new AssertionError("Must specify at least one signature string");
- }
-
- _signatures = new String[signatureStrings.length];
- System.arraycopy(signatureStrings, 0, _signatures, 0, _signatures.length);
- _assignmentType = assignmentType;
- }
-
- /**
- * Convenience constructor for most common case where composite only
- * consistes of a single type signature
- *
- * @param signatureString
- * @param assignmentType
- */
- public CompositeType(String signatureString, int assignmentType)
- {
- this(new String[]{signatureString}, assignmentType);
- }
- /**
- * @return the assignment type mask
- */
- public int getAssignmentTypeMask()
- {
- return _assignmentType;
- }
-
- /**
- * @return true if the composite type supports being on the LHS of an
- * assignment
- */
- public boolean isLHS()
- {
- return TypeUtil.matchesLHS(_assignmentType);
- }
-
- /**
- * @return true if the composite type supports being on the RHS of an
- * assignment
- */
- public boolean isRHS()
- {
- return TypeUtil.matchesRHS(_assignmentType);
- }
-
- /**
- * @return an array of booleans. The value in each index of the array
- * is true if the corresponding position _signatures corresponds to a type
- * signature and false if it's a method signature
- */
- public boolean[] getIsTypeSignature()
- {
- return getTypeSignatureFlags();
- }
-
- /**
- * @return the type signatures. Changes to the returned form do not
- * affect the internal values
- */
- public String[] getSignatures()
- {
- final String[] copy = new String[_signatures.length];
- System.arraycopy(_signatures, 0, copy, 0, _signatures.length);
- return copy;
- }
-
- public String toString()
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
- for (int i = 0; i < _signatures.length; i++)
- {
- stringBuffer.append(_signatures[i]);
- stringBuffer.append(" | ");
- }
-
- return stringBuffer.toString();
- }
-
- /**
- * @return a version of to string with of the type signatures replaced
- * with their more Javaeseque names
- */
- public String toUserReadableString()
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
- for (int i = 0; i < _signatures.length; i++)
- {
- final String signature = _signatures[i];
-
- if (getTypeSignatureFlags()[i])
- {
- stringBuffer.append(Signature.getSignatureSimpleName(signature));
- }
-
- if (i < _signatures.length -1)
- {
- stringBuffer.append(", ");
- }
- }
- return stringBuffer.toString();
- }
-
- private boolean[] getTypeSignatureFlags()
- {
- if (_isTypeSignature == null)
- {
- _isTypeSignature = new boolean[_signatures.length];
-
- for (int i = 0; i < _signatures.length; i++)
- {
- try
- {
- Signature.getTypeSignatureKind(_signatures[i]);
-
- // if an exception wasn't thrown above, then it
- // is some sort of type signature
- _isTypeSignature[i] = true;
- }
- catch (IllegalArgumentException ae)
- {
- // getTypeSignatureKind threw an exception, so
- // this signature is a method
- _isTypeSignature[i] = false;
- }
- }
- }
-
- return _isTypeSignature;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeTypeCoercer.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeTypeCoercer.java
deleted file mode 100644
index ea0d32615..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/CompositeTypeCoercer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-
-/**
- * Follows type coercion rules codified in section JSP.2.8 of the
- * JSP 2.0 Specification.
- *
- * This class operates on CompositeType's and returns raw
- * Java signatures for the single resulting type coercion.
- *
- * The rules are stretched a little bit since JSP.2.8 defines how to
- * coerce an *instance* A to a type T. But since we have no runtime instances,
- * only their types, we approximate by taking what we know about the type of A
- * and coercing it T as best we can.
- *
- * Also, whereas the spec says to throw errors when coercion is not possible,
- * we have two cases:
- *
- * 1) We can determine definitively that there is no coercion
- * 2) We cannot determine whether there is or isn't a coercion
- *
- * In case 1, we always throw an exception. In case 2, we return null to indicate
- * "indeterminate" result, rather than error.
- *
- * @author cbateman
- *
- */
-public class CompositeTypeCoercer
-{
- /**
- * This method follows JSP.2.8.3 except that rather than returning a specific
- * type that has been coerced to, it determines the most exact possible type
- * that typeOfA can be coerced to, to be number compatible. The caller must
- * decide what do with the return value compared to the type (N in the spec)
- * that they want to coerce to.
- *
- * @param typeOfA
- * @return a new signature for the type of A after being coerced to a Number
- * @throws TypeCoercionException if A can definitively not be coerced to
- * a number
- */
- public static String coerceToNumber(final CompositeType typeOfA)
- throws TypeCoercionException
- {
- String coercedType = null;
- boolean errorDetected = true; // assume error: only false if we
- // find a member of typeOfA that
- // coerces to number
-
- // JSP.2.8.1 -- auto-box primitives
- final CompositeType boxedTypeOfA =
- TypeTransformer.transformBoxPrimitives(typeOfA);
- final boolean[] typesigs = boxedTypeOfA.getIsTypeSignature();
-
- // iterate through all of the signatures that represent types
- // and find at least one that can be coerced to a number
- for (int i = 0; i < typesigs.length; i++)
- {
- if (typesigs[i])
- {
- try
- {
- final String testType =
- TypeCoercer.coerceToNumber(boxedTypeOfA.getSignatures()[i]);
-
- if (testType != null)
- {
- // if we have already found a coercible type, then
- // we need to return null, since we have a conflict that
- // we don't know how to resolve to a type??????
- if (coercedType != null)
- {
- return null;
- }
-
- coercedType = testType;
- }
- errorDetected = false; // we have found a number coercion or indeterminate
- }
- catch (TypeCoercionException tce)
- {
- // do nothing: so far error still detected
- }
- }
- }
-
- // we have three choices:
- // 1: if errorDetected was never cleared, we definitely never found
- // a coerceable type, so throw exception
- if (errorDetected)
- {
- throw new TypeCoercionException();
- }
- // otherwise the flag was cleared return what we found
- else
- {
- if (coercedType != null)
- {
- // need to unbox per JSP.2.8.1
- coercedType =
- TypeTransformer.transformUnboxPrimitives(coercedType);
- }
-
- return coercedType;
- }
- }
-
-
-// public static String coerceToBoolean(CompositeType compositeType)
-// {
-//
-// }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/FloatLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/FloatLiteralType.java
deleted file mode 100644
index ea36b5bc7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/FloatLiteralType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Represents an FloatLiteral as defined by JSP.2.9
- * @author cbateman
- *
- */
-public class FloatLiteralType extends NumericTypeLiteral
-{
- private final double _literalValue;
-
- /**
- * @param literalValue
- */
- public FloatLiteralType(double literalValue)
- {
- // according to the notes to JSP.2.9, bullet 5, float literals are doubles
- super(Signature.SIG_DOUBLE);
- _literalValue = literalValue;
- }
-
- protected Number getBoxedValue()
- {
- return new Double(_literalValue);
- }
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- if (T == BigInteger.class)
- {
- return new BigDecimal(_literalValue).toBigInteger();
- }
- else if (T == BigDecimal.class)
- {
- return new BigDecimal(_literalValue);
- }
-
- Number commonCoercion = super.coerceToNumber(T);
-
- if (commonCoercion == null)
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T);
- }
-
- return commonCoercion;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IAssignable.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IAssignable.java
deleted file mode 100644
index 06eb0fcee..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IAssignable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-/**
- * Defines the lhs/rhs rules for a type
- * @author cbateman
- *
- */
-public interface IAssignable
-{
- /**
- * Type is none: it cannot be assigned to. method binding.
- */
- public static int ASSIGNMENT_TYPE_NONE = 0x0;
- /**
- * Type is lhs: it can be assigned to
- */
- public static int ASSIGNMENT_TYPE_LHS = 0x1;
-
- /**
- * Type is rhs: it can be assigned from
- */
- public static int ASSIGNMENT_TYPE_RHS = 0x2;
-
- /**
- * @return the assigment mask
- */
- public int getAssignability();
-
- /**
- * @return true if ASSIGNMENT_TYPE_LHS is set in getAssignability
- */
- public boolean isLHS();
- /**
- * @return true if ASSIGNMENT_TYPE_RHS is set in getAssignability
- */
- public boolean isRHS();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IntegerLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IntegerLiteralType.java
deleted file mode 100644
index 67db775e0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/IntegerLiteralType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Represents a IntegerLiteral as defined by JSP.2.9
- * @author cbateman
- *
- */
-public class IntegerLiteralType extends NumericTypeLiteral
-{
- /**
- * A singleton for zero literals
- */
- public final static IntegerLiteralType ZERO = new IntegerLiteralType(0);
-
- private final long _literalValue;
-
- /**
- * @param literalValue
- */
- public IntegerLiteralType(long literalValue)
- {
- // according to the notes to JSP.2.9, bullet 4, integer literals are longs
- super(Signature.SIG_LONG);
- _literalValue = literalValue;
- }
-
- protected Number getBoxedValue()
- {
- return new Long(_literalValue);
- }
-
- /**
- * Per JSP.2.8.3, step 5
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#coerceToNumber(java.lang.Class)
- */
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- if (T == BigInteger.class)
- {
- return BigInteger.valueOf(_literalValue);
- }
- else if (T == BigDecimal.class)
- {
- return BigDecimal.valueOf(_literalValue);
- }
-
- Number commonCoercion = super.coerceToNumber(T);
-
- if (commonCoercion == null)
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T);
- }
-
- return commonCoercion;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/LiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/LiteralType.java
deleted file mode 100644
index 01f357cb7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/LiteralType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-
-/**
- * Encodes a type signature and a string that has some literal value based on
- * the type signature. The class represents only a value object -- no attempt
- * is made to assert that the literalValue is really of the type specified.
- *
- * @author cbateman
- *
- */
-public abstract class LiteralType extends ValueType
-{
-
- /**
- * Consider a new literal type
- *
- * @param signature
- * @param literalValue
- */
- protected LiteralType(final String signature)
- {
- super(signature, IAssignable.ASSIGNMENT_TYPE_RHS);
- }
-
- /**
- * @return the literal value string (unparsed)
- */
- public abstract String getLiteralValue();
-
- /**
- * @return the type signature
- */
- public final String getSignature() {
- return super.getSignature();
- }
-
- /**
- * @return a type signature for the kind of number this literal will coerce
- * into when asked to become a number or null if this cannot be determined
- * @throws TypeCoercionException if this literal has no legal coercion into
- * a number
- */
- public String getNumberCoercion() throws TypeCoercionException
- {
- // always box before coercion
- return
- TypeCoercer.coerceToNumber(
- TypeTransformer.transformBoxPrimitives(getSignature()));
- }
-
- /**
- * @param T
- * @return a Number coercion of the literal's value, null if indeterminate
- * @throws TypeCoercionException if the coercion is illegal
- */
- public abstract Number coerceToNumber(Class T) throws TypeCoercionException;
-
- /**
- * @return a Boolean coercion of the literal's value, null if indeterminate
- * @throws TypeCoercionException if the coercion is illegal
- */
- public abstract Boolean coerceToBoolean() throws TypeCoercionException;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/MethodType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/MethodType.java
deleted file mode 100644
index 67393e073..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/MethodType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-/**
- * Signature type for method bindings in an EL expression
- *
- * @author cbateman
- *
- */
-public class MethodType implements SignatureBasedType
-{
- private final String _methodName;
- private final String _signature;
-
- /**
- * @param methodName
- * @param signature
- */
- public MethodType(final String methodName, final String signature)
- {
- _methodName = methodName;
- _signature = signature;
- }
-
- /**
- * @see org.eclipse.jst.jsf.core.internal.types.SignatureBasedType#getSignature()
- */
- public String getSignature()
- {
- return _signature;
- }
-
- /**
- * @return the method name signature
- */
- public String getMethodName()
- {
- return _methodName;
- }
-
- public CompositeType toCompositeType()
- {
- return new CompositeType(_signature, IAssignable.ASSIGNMENT_TYPE_NONE);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NullLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NullLiteralType.java
deleted file mode 100644
index 2b7e93086..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NullLiteralType.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Represents a NullLiteralType per JSP.2.9
- *
- * @author cbateman
- *
- */
-public class NullLiteralType extends LiteralType
-{
- /**
- * The singleton null literal
- */
- public final static NullLiteralType SINGLETON = new NullLiteralType();
-
- /**
- * Construct a new null
- */
- private NullLiteralType()
- {
- super(TypeConstants.TYPE_NULL); // use void to indicate null in this situation
- }
-
- /**
- * Per JSP.2.8.5 null is always false
- *
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#coerceToBoolean()
- */
- public Boolean coerceToBoolean() throws TypeCoercionException
- {
- return Boolean.FALSE;
- }
-
- /**
- * Per JSP.2.8.3, null is always 0
- *
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#coerceToNumber(java.lang.Class)
- */
- public Number coerceToNumber(Class T) throws TypeCoercionException {
- if (T == BigInteger.class)
- {
- return BigInteger.ZERO;
- }
- else if (T == BigDecimal.class)
- {
- return new BigDecimal(0.0);
- }
- else if (T == Double.class || T == Double.TYPE)
- {
- return new Double(0.0);
- }
- else if (T == Float.class || T == Float.TYPE)
- {
- return new Float(0.0);
- }
- else if (T == Long.class || T == Long.TYPE)
- {
- return new Long(0L);
- }
- else if (T == Integer.class || T == Integer.TYPE)
- {
- return new Integer(0);
- }
- else if (T == Short.class || T == Short.TYPE)
- {
- return new Short((short)0);
- }
- else if (T == Byte.class || T == Byte.TYPE)
- {
- return new Byte((byte)0);
- }
- else
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T);
- }
- }
-
- /**
- * Per JSP.2.8.2 null is always an empty string
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#getLiteralValue()
- */
- public String getLiteralValue()
- {
- return "";
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NumericTypeLiteral.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NumericTypeLiteral.java
deleted file mode 100644
index b8571d700..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/NumericTypeLiteral.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-
-/**
- * Common super-type for Float and Integer literals
- * @author cbateman
- *
- */
-public abstract class NumericTypeLiteral extends LiteralType
-{
- /**
- * @param signature
- */
- protected NumericTypeLiteral(String signature)
- {
- super(signature);
- }
-
- /**
- * @return the boxed form of the numeric literal value
- */
- protected abstract Number getBoxedValue();
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- Number boxedLiteralValue = getBoxedValue();
-
- if (T == Double.class || T == Double.TYPE)
- {
- return new Double(boxedLiteralValue.doubleValue());
- }
- else if (T == Float.class || T == Float.TYPE)
- {
- return new Float(boxedLiteralValue.floatValue());
- }
- else if (T == Long.class || T == Long.TYPE)
- {
- return boxedLiteralValue;
- }
- else if (T == Integer.class || T == Integer.TYPE)
- {
- return new Integer(boxedLiteralValue.intValue());
- }
- else if (T == Short.class || T == Short.TYPE)
- {
- return new Short(boxedLiteralValue.shortValue());
- }
- else if (T == Byte.class || T == Byte.TYPE)
- {
- return new Byte(boxedLiteralValue.byteValue());
- }
- else
- {
- return null;
- }
- }
-
- public String getLiteralValue()
- {
- return getBoxedValue().toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#coerceToBoolean()
- */
- public Boolean coerceToBoolean() throws TypeCoercionException {
- // JSP.2.8.5 does not provide for number -> boolean coercion
- throw new TypeCoercionException("Cannot coerce number to boolean");
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/SignatureBasedType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/SignatureBasedType.java
deleted file mode 100644
index fe02ded17..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/SignatureBasedType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-/**
- * Defines a signature-based type. Signatures must conform to the JVM
- * type signature format as defined in the JVM specs and in the JDT Signature
- * class
- *
- * @author cbateman
- *
- */
-public interface SignatureBasedType
-{
- /**
- * @return the signature string
- */
- public String getSignature();
-
- /**
- * @return a version of the this type in CompositeType form
- */
- public CompositeType toCompositeType();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/StringLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/StringLiteralType.java
deleted file mode 100644
index e02435a79..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/StringLiteralType.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Represents a StringLiteral as defined by JSP.2.9
- *
- * @author cbateman
- */
-public class StringLiteralType extends LiteralType
-{
- private final String _literalValue;
-
- /**
- * @param value
- */
- public StringLiteralType(String value)
- {
- super(TypeConstants.TYPE_STRING);
- _literalValue = value;
- }
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- try
- {
- if (T == BigInteger.class)
- {
- if ("".equals(_literalValue))
- {
- return BigInteger.ZERO;
- }
- return new BigInteger(_literalValue);
- }
- else if (T == BigDecimal.class)
- {
- if ("".equals(_literalValue))
- {
- return new BigDecimal(0.0);
- }
- return new BigDecimal(_literalValue);
- }
- else if (T == Double.class || T == Double.TYPE)
- {
- if ("".equals(_literalValue))
- {
- return new Double(0.0);
- }
-
- return Double.valueOf(_literalValue);
- }
- else if (T == Float.class || T == Float.TYPE)
- {
- if ("".equals(_literalValue))
- {
- return new Float(0.0);
- }
- return Float.valueOf(_literalValue);
- }
- else if (T == Long.class || T == Long.TYPE)
- {
- if ("".equals(_literalValue))
- {
- return new Long(0L);
- }
- return Long.valueOf(_literalValue);
- }
- else if (T == Integer.class || T == Integer.TYPE)
- {
- if ("".equals(_literalValue))
- {
- return new Integer(0);
- }
- return Integer.valueOf(_literalValue);
- }
- else if (T == Short.class || T == Short.TYPE)
- {
- if ("".equals(_literalValue))
- {
- return new Short((short)0);
- }
- return Short.valueOf(_literalValue);
- }
- else if (T == Byte.class || T == Byte.TYPE)
- {
- if ("".equals(_literalValue))
- {
- return new Byte((byte)0);
- }
- return Byte.valueOf(_literalValue);
- }
- else
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T);
- }
- }
- catch (NumberFormatException nfe)
- {
- throw new TypeCoercionException(nfe);
- }
- }
-
- public String getLiteralValue()
- {
- return _literalValue;
- }
-
- public Boolean coerceToBoolean() throws TypeCoercionException
- {
- // JSP.2.8.5
- try
- {
- return Boolean.valueOf(_literalValue);
- }
- catch (Throwable t)
- {
- throw new TypeCoercionException(t);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercer.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercer.java
deleted file mode 100644
index 93341ff9e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Coercer for simple type signatures
- *
- * @author cbateman
- *
- */
-public class TypeCoercer
-{
-
- /**
- * Based on JSP.2.8.3 in JSP 2.0 specification
- *
- * @param boxedTypeSignature -- an auto-boxed type signature
- * @return the coerced type or null if cannot be resolved. No unboxing
- * is performed on the return.
- * @throws TypeCoercionException if boxedTypeSignature is
- */
- public static String coerceToNumber(String boxedTypeSignature)
- throws TypeCoercionException
- {
- // can't coerce arrays to numbers
- if (Signature.getTypeSignatureKind(boxedTypeSignature)
- == Signature.ARRAY_TYPE_SIGNATURE)
- {
- throw new TypeCoercionException("Cannot coerce arrays to numbers");
- }
- else
- {
- // if it's character, pre-coerce to short per step 2
- if ("Ljava.lang.Character;".equals(boxedTypeSignature))
- {
- boxedTypeSignature = "Ljava.lang.Short;";
- }
-
- if (TypeCoercer.typeIsNumeric(boxedTypeSignature)
- || TypeCoercer.typeIsNull(boxedTypeSignature))
- {
- return boxedTypeSignature;
- }
- else if (typeIsString(boxedTypeSignature))
- {
- // undetermined a string may or not resolve to a number
- // depending on its runtime value
- return null;
- }
- else
- {
- throw new TypeCoercionException();
- }
- }
- }
-
- /**
- * @param boxedTypeSignature
- * @return true if type can be coerced to boolean; null if indeterminate
- */
- public static boolean canCoerceToBoolean(String boxedTypeSignature)
- {
- // JSP.2.8.5 -- boolean is always boolean; string is converted by Boolean.valueOf(String)
- if (typeIsBoolean(boxedTypeSignature)
- || typeIsString(boxedTypeSignature)
- || typeIsNull(boxedTypeSignature))
- {
- return true;
- }
- // nothing else really convertible besides null
- else
- {
- return false;
- }
- }
-
- /**
- * @param typeSignature -- boxed type signature
- * @return true if the typeSignature is numeric
- */
- public static boolean typeIsNumeric(final String typeSignature)
- {
- return (TypeConstants.TYPE_BOXED_BYTE.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_SHORT.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_LONG.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_FLOAT.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_DOUBLE.equals(typeSignature) ||
- TypeConstants.TYPE_BIG_INTEGER.equals(typeSignature) ||
- TypeConstants.TYPE_BIG_DOUBLE.equals(typeSignature));
- }
-
- /**
- * @param typeSignature
- * @return true if the typeSignature represents a String
- */
- public static boolean typeIsString(final String typeSignature)
- {
- return (TypeConstants.TYPE_STRING.equals(typeSignature));
- }
-
- /**
- * @param typeSignature -- boxed type signature
- * @return true if the typeSignature represents a boxed boolean
- */
- public static boolean typeIsBoolean(final String typeSignature)
- {
- return ("Ljava.lang.Boolean;".equals(typeSignature));
- }
-
- /**
- * @param typeSignature
- * @return true if type is the EL null type
- */
- public static boolean typeIsNull(final String typeSignature)
- {
- return (TypeConstants.TYPE_NULL.equals(typeSignature));
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercionException.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercionException.java
deleted file mode 100644
index 17f865783..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeCoercionException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-/**
- * @author cbateman
- *
- */
-public class TypeCoercionException extends Exception
-{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * @see java.lang.Exception
- */
- public TypeCoercionException() {
- super();
- }
-
- /**
- * @param message
- * @param cause
- * @see java.lang.Exception
- */
- public TypeCoercionException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * @param message
- * @see java.lang.Exception
- */
- public TypeCoercionException(String message) {
- super(message);
- }
-
- /**
- * @param cause
- * @see java.lang.Exception
- */
- public TypeCoercionException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeComparator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeComparator.java
deleted file mode 100644
index acd108532..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeComparator.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Static utility class used to compare two CompositeTypes for compatability
- *
- * @author cbateman
- *
- */
-public final class TypeComparator
-{
- /**
- * @param firstType
- * @param secondType
- * @return true if firstType is assignable to secondType or vice-versa,
- * depending on their assignment and runtime types
- */
- public static Diagnostic calculateTypeCompatibility(final CompositeType firstType,
- final CompositeType secondType)
- {
- // first, box all primitives
- final CompositeType boxedFirstType =
- TypeTransformer.transformBoxPrimitives(firstType);
- final CompositeType boxedSecondType =
- TypeTransformer.transformBoxPrimitives(secondType);
-
- final String[] mustBeSatisfied = boxedFirstType.getSignatures();
- final String[] testSignatures = boxedSecondType.getSignatures();
- // TODO: need better user messages here
- Diagnostic result = new BasicDiagnostic(Diagnostic.ERROR, "", 0,
- "EL expression does not evaluate to expected types for this attribute", null);
- // now loop through each type in the first type and see
- // if there is a type satisfying it in the second
- MAIN_LOOP:
- for (int i = 0; i < mustBeSatisfied.length; i++)
- {
- final String curSatisfyType = mustBeSatisfied[i];
-
- CHECK_CANDIDATES:
- for (int j = 0; j < testSignatures.length; j++)
- {
- final String testType = testSignatures[j];
-
- // simplest success is an exact match
- if (curSatisfyType.equals(testType))
- {
- result = Diagnostic.OK_INSTANCE;
- break MAIN_LOOP;
- }
-
- // or if both are methods, check to see if the
- // method signatures match
- if (TypeUtil.isMethodSignature(curSatisfyType))
- {
- // if the satisfy type is a method,
- // the test type is not, then don't go any
- // further, since we know the won't match
- if (!TypeUtil.isMethodSignature(testType))
- {
- continue CHECK_CANDIDATES;
- }
- else
- {
- final Diagnostic test =
- methodSignaturesMatch(curSatisfyType, testType);
-
- if (test.getSeverity() == Diagnostic.OK)
- {
- result = Diagnostic.OK_INSTANCE;
- // found a match so break
- break MAIN_LOOP;
- }
- }
- }
-
- // or, can we coerce testType to curSatisfyType
- if (canCoerce(testType, curSatisfyType))
- {
- result = Diagnostic.OK_INSTANCE;
- break MAIN_LOOP;
- }
- }
- }
-
- return result;
- }
-
- private static boolean canCoerce(String testType, String checkType)
- {
- // can always to coerce to string
- if (TypeCoercer.typeIsString(checkType))
- {
- return true;
- }
- else if (TypeCoercer.typeIsNumeric(checkType))
- {
- return canCoerceNumeric(testType);
- }
- else if (TypeCoercer.typeIsBoolean(checkType))
- {
- return TypeCoercer.canCoerceToBoolean(testType);
- }
-
- // otherwise, no type coercion available
- return false;
- }
-
- private static boolean canCoerceNumeric(String testType)
- {
- try
- {
- TypeCoercer.coerceToNumber(testType);
- // TODO: there is a case when coerceToNumber returns
- // null meaning "not sure", that we may want to handle
- // differently, with a warning
- return true;
- }
- catch (TypeCoercionException tce)
- {
- // outright failure -- can't coerce
- return false;
- }
- }
-
- private static Diagnostic methodSignaturesMatch(String firstMethodSig, String secondMethodSig)
- {
- // TODO: need to account for primitive type coercions
- final String[] firstMethodParams =
- Signature.getParameterTypes(firstMethodSig);
- final String[] secondMethodParams =
- Signature.getParameterTypes(secondMethodSig);
-
- // fail fast if param count doesn't match
- if (firstMethodParams.length != secondMethodParams.length)
- {
- return new BasicDiagnostic(Diagnostic.ERROR, "", 0,
- "Parameter count mismatch", null);
- }
-
- // now check each parameter
- for (int i = 0; i < firstMethodParams.length; i++)
- {
- // need to box primitives before comparing
- final String firstMethodParam =
- TypeTransformer.transformBoxPrimitives(firstMethodParams[i]);
- final String secondMethodParam =
- TypeTransformer.transformBoxPrimitives(secondMethodParams[i]);
-
- if (!firstMethodParam.equals(secondMethodParam))
- {
- return new BasicDiagnostic(Diagnostic.ERROR, "", 0,
- "Type mismatch on parameter "+i, null);
- }
- }
-
- // if we get to here then we need only check the return type
- final String firstReturn =
- TypeTransformer.transformBoxPrimitives(Signature.getReturnType(firstMethodSig));
- final String secondReturn =
- TypeTransformer.transformBoxPrimitives(Signature.getReturnType(secondMethodSig));
-
- if (!firstReturn.equals(secondReturn))
- {
- return new BasicDiagnostic(Diagnostic.ERROR, "", 0,
- "Return types don't match", null);
- }
-
- // if we get to here, then everything checks out
- return Diagnostic.OK_INSTANCE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeConstants.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeConstants.java
deleted file mode 100644
index 3d91533a1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeConstants.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-/**
- * @author cbateman
- *
- */
-public class TypeConstants
-{
- /**
- * we overload "void" to represent null
- */
- public final static String TYPE_NULL = "V";
- /**
- * unboxed boolean
- */
- public final static String TYPE_BOOLEAN = "Z";
- /**
- * string type
- */
- public final static String TYPE_STRING = "Ljava.lang.String;";
- /**
- * big integer
- */
- public final static String TYPE_BIG_INTEGER = "Ljava.math.BigInteger;";
-
- /**
- * big double
- */
- public final static String TYPE_BIG_DOUBLE = "Ljava.math.BigDouble;";
-
- /* boxed types */
- /**
- * Boxed byte
- */
- public final static String TYPE_BOXED_BYTE = "Ljava.lang.Byte;";
- /**
- * Boxed short
- */
- public final static String TYPE_BOXED_SHORT = "Ljava.lang.Short;";
- /**
- * Boxed int
- */
- public final static String TYPE_BOXED_INTEGER = "Ljava.lang.Integer;";
- /**
- * Boxed long
- */
- public final static String TYPE_BOXED_LONG = "Ljava.lang.Long;";
- /**
- * Boxed float
- */
- public final static String TYPE_BOXED_FLOAT = "Ljava.lang.Float;";
- /**
- * Boxed double
- */
- public final static String TYPE_BOXED_DOUBLE = "Ljava.lang.Double;";
- /**
- * Boxed boolean
- */
- public final static String TYPE_BOXED_BOOLEAN = "Ljava.lang.Boolean;";
- /**
- * Boxed char
- */
- public final static String SIGNATURE_BOXED_CHARACTER = "Ljava.lang.Character";
- /**
- * Map type
- */
- public final static String TYPE_MAP = "Ljava.util.Map;";
- /**
- * Collection type
- */
- public final static String TYPE_COLLECTION = "Ljava.util.Collection;";
- /**
- * Comparable type
- */
- public final static String TYPE_COMPARABLE = "Ljava.lang.Comparable;";
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeTransformer.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeTransformer.java
deleted file mode 100644
index ffb831ea8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeTransformer.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Transforms one CompositeType to another according to particular
- * transform rules.
- *
- * In general, every transformation should be of the form:
- *
- * CompositeType transform(CompositeType original, other inputs...);
- *
- * @author cbateman
- *
- */
-public class TypeTransformer
-{
- private final static Map boxConversions = new HashMap();
- private final static Map unBoxConversions = new HashMap();
-
- static
- {
- // see jdt.core.Signature or JVM link spec for more details
- boxConversions.put("B", "Ljava.lang.Byte;");
- boxConversions.put("C", "Ljava.lang.Character;");
- boxConversions.put("D", "Ljava.lang.Double;");
- boxConversions.put("F", "Ljava.lang.Float;");
- boxConversions.put("I", "Ljava.lang.Integer;");
- boxConversions.put("J", "Ljava.lang.Long;");
- boxConversions.put("S", "Ljava.lang.Short;");
- boxConversions.put("Z", "Ljava.lang.Boolean;");
- // don't box V
- boxConversions.put("V", "V");
-
- // invert hte box conversions
- for (final Iterator it = boxConversions.keySet().iterator(); it.hasNext();)
- {
- final String newValue = (String) it.next();
- final String newKey = (String) boxConversions.get(newValue);
- if (unBoxConversions.put(newKey, newValue) != null)
- {
- // if put returns non-null then we have replaced a key
- // added on a previous iteration. This implies
- // that box mappings are no longer one-to-one
- throw new AssertionError("Duplicated boxing value");
- }
- }
- }
-
- /**
- * @param compositeType
- * @return an equivilent form of compositeType with all primitive type
- * signatures converted to their fully qualified boxed equivilent but
- * otherwise unchanged.
- *
- * Example: J -> Ljava.lang.Long;
- */
- public static CompositeType transformBoxPrimitives(CompositeType compositeType)
- {
- String[] signatures = compositeType.getSignatures();
- String[] newsignatures = new String[signatures.length];
-
- for (int i = 0; i < signatures.length; i++)
- {
- newsignatures[i] = transformBoxPrimitives(signatures[i]);
- }
-
- return new CompositeType(newsignatures, compositeType.getAssignmentTypeMask());
- }
-
- /**
- * Performs boxing for a single typeSignature string
- * @param curSignature
- * @return the boxed signature
- */
- public static String transformBoxPrimitives(final String curSignature)
- {
- String newSignature = curSignature;
-
- // first determine if we have a type or method signature
- try
- {
- int kind = Signature.getTypeSignatureKind(curSignature);
-
- // interested in base types, since these need boxing
- if (kind == Signature.BASE_TYPE_SIGNATURE)
- {
- // grab the box for the primitive
- newSignature = (String) boxConversions.get(curSignature);
- }
- else if (kind == Signature.ARRAY_TYPE_SIGNATURE)
- {
- // check if it's array of primitives
- final String baseType = Signature.getElementType(curSignature);
-
- if (Signature.getTypeSignatureKind(baseType) == Signature.BASE_TYPE_SIGNATURE)
- {
- // it is, so box it
- final String newBaseType = (String) boxConversions.get(baseType);
- final int numBraces = Signature.getArrayCount(curSignature);
- newSignature = "";
- for (int j = 0; j < numBraces; j++)
- {
- newSignature += "[";
- }
-
- newSignature += newBaseType;
- }
- }
- }
- catch (IllegalArgumentException e)
- {
- // signature was not a type signature, so must be a method sig
- // do nothing: don't box method types
- }
-
- return newSignature;
- }
-
- /**
- * Performs the exact inverse of transformBoxPrimitives -- takes all
- * boxing type signatures and replaces them with their primitive equivilent
- * @param compositeType
- * @return a new composite with all boxed primitives unboxed
- */
- public static CompositeType transformUnboxPrimitives(CompositeType compositeType)
- {
- String[] signatures = compositeType.getSignatures();
- String[] newsignatures = new String[signatures.length];
-
- for (int i = 0; i < signatures.length; i++)
- {
- newsignatures[i] = transformUnboxPrimitives(signatures[i]);
- }
-
- return new CompositeType(newsignatures, compositeType.getAssignmentTypeMask());
- }
-
- /**
- * Performs unboxing for a single typeSignature string
- *
- * @param typeSignature
- * @return the transformed signature
- */
- public static String transformUnboxPrimitives(final String typeSignature)
- {
- String newSignature = typeSignature;
-
- // first determine if we have a type or method signature
- try
- {
- int kind = Signature.getTypeSignatureKind(typeSignature);
-
- // interested in class types, since these need boxing
- if (kind == Signature.CLASS_TYPE_SIGNATURE)
- {
- // grab the box for the primitive
- String checkForUnbox = (String) unBoxConversions.get(typeSignature);
-
- if (checkForUnbox != null)
- {
- newSignature = checkForUnbox;
- }
- }
- else if (kind == Signature.ARRAY_TYPE_SIGNATURE)
- {
- // check if it's array of objects
- final String baseType = Signature.getElementType(typeSignature);
-
- if (Signature.getTypeSignatureKind(baseType) == Signature.CLASS_TYPE_SIGNATURE)
- {
- // it is, so unbox it
- final String newBaseTypeCandidate = (String) unBoxConversions.get(baseType);
-
- if (newBaseTypeCandidate != null)
- {
- final int numBraces = Signature.getArrayCount(typeSignature);
- newSignature = "";
- for (int j = 0; j < numBraces; j++)
- {
- newSignature += "[";
- }
-
- newSignature += newBaseTypeCandidate;
- }
- }
- }
- }
- catch (IllegalArgumentException e)
- {
- // signature was not a type signature, so must be a method sig
- // do nothing: don't box method types
- }
-
- return newSignature;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeUtil.java
deleted file mode 100644
index b06b99259..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/TypeUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Package utility class
- * @author cbateman
- *
- */
-/*package*/final class TypeUtil
-{
- /**
- * @param assignmentType
- * @return true if assignmentType has lhs flag set
- */
- public static boolean matchesLHS(int assignmentType)
- {
- return (assignmentType & IAssignable.ASSIGNMENT_TYPE_LHS) != 0;
- }
-
- /**
- * @param assignmentType
- * @return true if assignmentType has rhs flag set
- */
- public static boolean matchesRHS(int assignmentType)
- {
- return (assignmentType & IAssignable.ASSIGNMENT_TYPE_RHS) != 0;
- }
-
- /**
- * @param signature
- * @return true if the signature is a method signature
- */
- public static boolean isMethodSignature(final String signature)
- {
- // method signature must start with a "("
- return signature.charAt(0) == Signature.C_PARAM_START;
- }
- private TypeUtil() {/*not instantiable*/}
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/ValueType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/ValueType.java
deleted file mode 100644
index e34e495af..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/types/ValueType.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.core.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Value object representing a value binding type by it's type and assignability
- * information
- *
- * @author cbateman
- *
- */
-public class ValueType implements SignatureBasedType, IAssignable
-{
- private final static String[] EMPTY_STRING_ARRAY = new String[0];
-
- private final String _signature;
- private final int _assignmentMask;
- private final String[] _superTypes;
- private final String[] _interfaceTypes;
-
- private String[] _allTypes; // lazy creation on getAllTypes
-
- /**
- * Construct a new ValueType object with the given
- * signature
- *
- * @param signature
- * @param superTypes
- * @param interfaceTypes
- * @param assignmentMask
- */
- public ValueType(final String signature,
- final String[] superTypes,
- final String[] interfaceTypes,
- final int assignmentMask)
- {
- if (signature == null)
- {
- throw new AssertionError("signature can never be null");
- }
-
- _signature = signature;
- _assignmentMask = assignmentMask;
- _superTypes = superTypes != null ? superTypes : EMPTY_STRING_ARRAY;
- _interfaceTypes = interfaceTypes != null ? interfaceTypes : EMPTY_STRING_ARRAY;
- }
-
- /**
- * Copy constructor equivilent to
- * ValueType(template.getSignature(), template.getSuperTypes(), template.getInterfaceTypes(),assingmentMask)
- *
- * @param template
- * @param assignmentMask
- */
- public ValueType(final ValueType template, final int assignmentMask)
- {
- this(template._signature, template._superTypes,
- template._interfaceTypes, assignmentMask);
- }
-
- /**
- * Convienence constructor for creating ValueType's with no supertype
- * or interface info. Equivilent to:
- * ValueType(signature, new String[0], new String[0], assignmentMask)
- *
- * @param signature
- * @param assignmentMask
- */
- public ValueType(final String signature, final int assignmentMask)
- {
- this(signature, EMPTY_STRING_ARRAY, EMPTY_STRING_ARRAY, assignmentMask);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.types.SignatureBasedType#getSignature()
- */
- public String getSignature()
- {
- return _signature;
- }
-
- public int getAssignability() {
- return _assignmentMask;
- }
-
- public boolean isLHS() {
- return TypeUtil.matchesLHS(_assignmentMask);
- }
-
- public boolean isRHS() {
- return TypeUtil.matchesRHS(_assignmentMask);
- }
-
- public String toString()
- {
- return Signature.getSignatureSimpleName
- (TypeTransformer.transformBoxPrimitives(_signature));
- }
-
- /**
- * @return an array of all signatures of all super types or empty
- * array if there are no super types for this type
- */
- public String[] getSuperTypes()
- {
- return _superTypes;
- }
-
- /**
- * @return an array of all interfaces implemented or empty array
- * if none
- */
- public String[] getInterfaceTypes()
- {
- return _interfaceTypes;
- }
-
- /**
- * @return all types including the base type, super types and interface
- * types.
- */
- public String[] getAllTypes()
- {
- if (_allTypes == null)
- {
- int numberOfTypes = 1 + _superTypes.length + _interfaceTypes.length;
- _allTypes = new String[numberOfTypes];
- _allTypes[0] = _signature;
- System.arraycopy(_superTypes, 0, _allTypes, 1, _superTypes.length);
- System.arraycopy(_interfaceTypes, 0, _allTypes, 1+_superTypes.length, _interfaceTypes.length);
- }
- return _allTypes;
- }
-
-
-
- public CompositeType toCompositeType()
- {
- return new CompositeType(getAllTypes(), getAssignability());
- }
-
- /**
- * @param signature
- * @return true if an instance of this type would satisfy instanceof signature
- *
- */
- public boolean isInstanceOf(final String signature)
- {
- final String[] allTypes = getAllTypes();
-
- for (int i = 0; i < allTypes.length; i++)
- {
- if (allTypes[i].equals(signature))
- {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project
deleted file mode 100644
index ca987a4db..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.facesconfig.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 97e2fd230..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Apr 25 16:26:29 CST 2006
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3ee4f0b5f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,51 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: FacesConfig Editor Plug-in
-Bundle-SymbolicName: org.eclipse.jst.jsf.facesconfig.ui;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin
-Bundle-Vendor: Sybase, Inc
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui.views,
- org.eclipse.help,
- org.eclipse.ui.forms,
- org.eclipse.gef,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.ui,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jst.jsp.core,
- org.eclipse.draw2d,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.common.ui.properties,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.jface.text,
- org.eclipse.emf.edit,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.jst.jsp.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.common.emf,
- org.eclipse.jst.jsf.facesconfig.edit,
- org.eclipse.jem.util,
- org.eclipse.jst.jsf.facesconfig.common,
- org.eclipse.jst.jsf.facesconfig,
- org.eclipse.ui.cheatsheets,
- org.apache.xerces
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.jsf.facesconfig.ui,
- org.eclipse.jst.jsf.facesconfig.ui.dialog,
- org.eclipse.jst.jsf.facesconfig.ui.page,
- org.eclipse.jst.jsf.facesconfig.ui.page.detail,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.util,
- org.eclipse.jst.jsf.facesconfig.ui.preference,
- org.eclipse.jst.jsf.facesconfig.ui.provider,
- org.eclipse.jst.jsf.facesconfig.ui.section,
- org.eclipse.jst.jsf.facesconfig.ui.util,
- org.eclipse.jst.jsf.facesconfig.ui.wizard
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties
deleted file mode 100644
index 340b7dd24..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- icons/,\
- plugin.xml,\
- plugin.properties,\
- cheatsheets/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml
deleted file mode 100644
index c9a4d88f6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<cheatsheet title="Faces Configuration Editor">
-
- <intro>
- <description>
- This cheat sheet will automatically launch wizards, perform
- actions, and guide you through the individual steps to
- create a new Service. To learn more about using cheat sheets
- or to see a list of available cheat sheets click help (?).
- To start working on this cheat sheet, click the &quot;Click
- to begin&quot; button below.
- </description>
- </intro>
-
- <item
- href="/com.sybase.stf.jmt.doc.user/reference/FacesConfigEditor/facesconfig-editor.htm"
- title="Overview Details">
- <description>
- Description on how to use the overview page.
- </description>
- </item>
-
- <item href="/com.sybase.stf.jmt.doc.user/tasks/tasks-12.htm"
- title="Pageflow Page">
- <description>
- Description or introduction on how to use this page to
- create page flow.
- </description>
- </item>
-
- <item
- href="/com.sybase.stf.jmt.doc.user/tasks/FacesConfigEditor/managedbean.htm"
- title="Managed beans Page">
- <description>
- Description on how to use the "managed beans page" to
- create, edit and remove a managed bean in JSF.
- </description>
- </item>
-
- <item
- href="/com.sybase.stf.jmt.doc.user/tasks/FacesConfigEditor/component.htm"
- title="Components Page">
- <description>
- Description on how to create, edit and remove a component,
- renderkit, converter and validator.
- </description>
- </item>
-
- <item
- href="/com.sybase.stf.jmt.doc.user/tasks/FacesConfigEditor/Others/actionlistener.htm"
- title="Others Page">
- <description>
- Description on how to manage other elements in the faces
- config file: action listener, message bundle, locale
- </description>
- </item>
-
- <item title="Source Page">
- <description>
- User can edit the source of faces config here.
- </description>
- </item>
-
- <item title="Completion">
- <description>
- Congratulations, you should now be able to take further
- actions.
- </description>
- </item>
-</cheatsheet> \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gif
deleted file mode 100644
index 0e5bcf65a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gif
deleted file mode 100644
index 44cd0448b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gif
deleted file mode 100644
index ad8e5b6b9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gif
deleted file mode 100644
index d49078b11..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gif
deleted file mode 100644
index 591ceb204..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gif
deleted file mode 100644
index 0a96aaa28..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gif
deleted file mode 100644
index e875d0115..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gif
deleted file mode 100644
index cbe011bec..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gif
deleted file mode 100644
index 6cdef7bd6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gif
deleted file mode 100644
index 5ea67da7a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gif
deleted file mode 100644
index 5ea67da7a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gif
deleted file mode 100644
index c241f5f7e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gif
deleted file mode 100644
index 5002791a3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gif
deleted file mode 100644
index 7ef81e587..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gif
deleted file mode 100644
index fea95ce77..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gif
deleted file mode 100644
index 6c10cea7a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gif
deleted file mode 100644
index 8004b1961..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gif
deleted file mode 100644
index f302d8c88..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gif
deleted file mode 100644
index 852dc81ba..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gif
deleted file mode 100644
index 97cafa9a8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gif
deleted file mode 100644
index 5b56ee385..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gif
deleted file mode 100644
index 2fc426f43..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gif
deleted file mode 100644
index 1f0002b37..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gif
deleted file mode 100644
index d483f4861..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gif
deleted file mode 100644
index 9d70301da..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gif
deleted file mode 100644
index 03f656f3e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
deleted file mode 100644
index 1c60f8d03..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-####################################################
-# Plugin XML information.
-####################################################
-
-# Editors
-facesConfigEditor=Faces Config Editor
-facesConfigEditorIcon=icons/facesconfig/FacesConfig_Plugin.gif
-
-# Introduction
-pageflow.editor.intro.name = Introduction
-pageflow.editor.intro.description =
-pageflow.editor.intro.section.heading = The Faces Configuration Editor
-pageflow.editor.intro.section.description = The faces configuration editor helps you to complete the JSF web application development process by allowing you to edit faces configuration. Use the pages in this editor to define and edit page navigations, managed beans, component, converter, validator, renderkit and other element configurations.
-pageflow.editor.intro.cheatsheets.link = Tutorial
-pageflow.editor.intro.cheatsheets.text = Launch the cheat sheet for guidance in working with the editor.
-pageflow.editor.intro.help.link = Help
-pageflow.editor.intro.help.text = Launch the help system and review topics about working with faces configuration descriptor.
-pageflow.editor.intro.start.link = Start
-pageflow.editor.intro.start.text = Start working with the editor by selecting PageFlow and defining page navigations.
-
-#overview Section
-pageflow.editor.overview.name = Editor Information
-pageflow.editor.overview.description = This page summaries the editors information.
-pageflow.editor.overview.pageflow.link = PageFlow Editor
-pageflow.editor.overview.pageflow.text = Editor to create or modify Navigation Rules.
-
-pageflow.editor.intro.overview.mbean.text = Editor to create or modify Managed Beans.
-pageflow.editor.overview.mbean.link = ManagedBeans Editor
-pageflow.editor.intro.overview.components.text = Editor to create or modify component elements.
-pageflow.editor.overview.components.link = Components Editor
-pageflow.editor.intro.overview.others.text = Editor to create or modify other elements.
-pageflow.editor.overview.others.link = Others Editor
-pageflow.editor.intro.overview.source.text = Text Editor source.
-pageflow.editor.overview.source.link = Source Editor
-
-contentType.defaultFacesConfig.name = Default FacesConfig File
-contentType.webdotxmlfile.name = Web Application Description File
-
-#property tab's name
-propertyTab.general=Attributes
-propertyTab.attribute=Quick Edit
-
-cheatsheet.pagefloweditor.name = Pageflow Editor Cheat Sheet
-cheatsheet.pagefloweditor.description = Cheat Sheet for using the Pageflow Editor \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml
deleted file mode 100644
index 0a392efde..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.wst.sse.ui.internal.provisional.preferences"
- class="org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences"
- id="org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences"
- name="JSF FacesConfig UI"/>
- </extension>
-<extension point="org.eclipse.ui.editors">
-
- <editor
- class="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- contributorClass="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigActionBarContributor"
- default="false"
- extensions="xml"
- icon="icons/facesconfig/FacesConfig_Plugin.gif"
- id="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- name="FacesConfig Editor">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jsf.facesconfig.facesConfigFile" />
- </editor>
- </extension>
-
- <!-- ********** Introduction Page of PageFlow editor************** -->
- <extension id="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- name="%pageflow.editor.intro.name"
- point="org.eclipse.jst.jsf.facesconfig.common.introductionPage">
- <introductionpage name="Introduction"
- description="%pageflow.editor.intro.description">
- <introductionelement icon="icons/FacesConfig_Introduction.gif"
- heading="The Faces Configuration Editor"
- text="%pageflow.editor.intro.section.description"/>
- <introductionelement
- actionparameters="org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor"
- icon="icons/FacesConfig_GotoEditor.gif"
- hyperlinkaction="org.eclipse.jst.jsf.facesconfig.common.actions.OpenPageAction"
- text="%pageflow.editor.intro.start.text"
- hyperlink="%pageflow.editor.intro.start.link"/>
- <introductionelement
- actionparameters="FacesConfigEditor.CheatSheet"
- icon="icons/FacesConfig_Tutorial.gif"
- hyperlinkaction="org.eclipse.jst.jsf.facesconfig.common.actions.LoadCheatSheetAction"
- text="%pageflow.editor.intro.cheatsheets.text"
- hyperlink="%pageflow.editor.intro.cheatsheets.link"/>
- <introductionelement actionparameters="com.sybase.stf.jmt.editors_pageflow_PageflowPage"
- icon="icons/overview_obj.gif"
- hyperlinkaction="org.eclipse.jst.jsf.facesconfig.common.actions.LoadHelpAction"
- text="%pageflow.editor.intro.help.text"
- hyperlink="%pageflow.editor.intro.help.link"/>
- </introductionpage>
- </extension>
- <!-- ********** End Introduction Page ************** -->
- <!-- ************* properties view ************** -->
- <extension point="org.eclipse.wst.common.ui.properties.propertyTabs">
- <propertyTabs
- contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor">
- <propertyTab label="%propertyTab.attribute" category="attribute"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.attribute"/>
- <propertyTab label="%propertyTab.general" category="general"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.general"/>
- </propertyTabs>
- </extension>
- <extension point="org.eclipse.wst.common.ui.properties.propertyContributor">
- <propertyContributor
- sectionDescriptorProvider="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowSectionDescriptorProvider"
- contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- labelProvider="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowSectionLabelProvider">
- <propertyCategory category="attribute"/>
- <propertyCategory category="general"/>
- </propertyContributor>
- </extension>
- <extension
- point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <cheatsheet
- composite="false"
- contentFile="cheatsheets/facesconfigeditor.xml"
- id="FacesConfigEditor.CheatSheet"
- name="FacesConfigEditor CheatSheet"/>
- </extension>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
deleted file mode 100644
index ad7243e0b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
+++ /dev/null
@@ -1,663 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class EditorMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.EditorMessages";
-
- private EditorMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EditorMessages.class);
- }
-
- public static String UI_Button_Add;
-
- public static String UI_Button_Edit;
-
- public static String UI_Button_Remove;
-
- public static String UI_Button_Add_more;
-
- public static String UI_Button_Edit_more;
-
- public static String Remove_Title;
-
- public static String Remove_Msg;
-
- public static String FindType;
-
- public static String FindType_Filter;
-
- public static String FindType_Error_CannotFindType;
-
- public static String FacesConfigEditor_Introduction_TabName;
-
- public static String FacesConfigEditor_Overview_TabName;
-
- public static String FacesConfigEditor_Pageflow_TabName;
-
- public static String FacesConfigEditor_ManagedBeans_TabName;
-
- public static String FacesConfigEditor_Components_TabName;
-
- public static String FacesConfigEditor_Others_TabName;
-
- public static String FacesConfigEditor_Source_TabName;
-
- public static String editor_pageflow_page_intro_name;
-
- public static String editor_pageflow_page_intro_title;
-
- public static String editor_pageflow_page_intro_help_HelpContextID;
-
- public static String editor_pageflow_page_intro_help_HelpToolTip;
-
- public static String ManagedBeanPage_Title;
-
- public static String ManagedBeanMasterSection_Name;
-
- public static String ManagedBeanMasterSection_Description;
-
- public static String ManagedBeanMasterSection_HelpContextID;
-
- public static String ManagedBeanMasterSection_HelpToolTip;
-
- public static String ManagedBeanGeneralSection_Name;
-
- public static String ManagedBeanGeneralSection_Desc;
-
- public static String ManagedBeanGeneralSection_HelpContextID;
-
- public static String ManagedBeanGeneralSection_HelpToolTip;
-
- public static String ManagedBeanGeneralSection_ManagedBeanName;
-
- public static String ManagedBeanGeneralSection_ManagedBeanClass;
-
- public static String ManagedBeanGeneralSection_ManagedBeanScope;
-
- public static String InitializationSection_Name;
-
- public static String InitializationSection_Description;
-
- public static String InitializationSection_HelpContextID;
-
- public static String InitializationSection_HelpToolTip;
-
- public static String ManagedBeanPropertyEditDialog_Title_NewPropertyEntry;
-
- public static String ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry;
-
- public static String ManagedBeanPropertyEditDialog_PropertyName;
-
- public static String ManagedBeanPropertyEditDialog_PropertyClass;
-
- public static String ManagedBeanPropertyEditDialog_PropertyClass_Browse;
-
- public static String ManagedBeanPropertyEditDialog_ValueType;
-
- public static String ManagedBeanProeprtyEditPage_Description;
-
- public static String ManagedBeanPropertyEditDialog_Value;
-
- public static String ManagedBeanPropertyEditWizard_Title;
-
- public static String ManagedBeanProeprtyEditPage_Title;
-
- public static String ManagedBeanPropertyEditDialog_Value_Change;
-
- public static String ManagedBeanPropertyEditDialog_FindType;
-
- public static String ManagedBeanPropertyEditDialog_FindType_Filter;
-
- public static String InitializationSection_ClassType;
-
- public static String InitializationSection_ClassType_General;
-
- public static String InitializationSection_ClassType_Map;
-
- public static String InitializationSection_ClassType_List;
-
- public static String InitializationSection_PropertyTable_Name;
-
- public static String InitializationSection_PropertyTable_Class;
-
- public static String InitializationSection_PropertyTable_Value;
-
- public static String InitializationSection_MapType_KeyClass;
-
- public static String InitializationSection_MapType_ValueClass;
-
- public static String InitializationSection_MapTable_Title;
-
- public static String InitializationSection_MapTable_Key;
-
- public static String InitializationSection_MapTable_Value;
-
- public static String InitializationSection_ListType_ValueClass;
-
- public static String InitializationSection_ListTable_Title;
-
- public static String InitializationSection_ListTable_Value;
-
- public static String ListEntriesEditPage_Title;
-
- public static String ListEntriesWizard_Title;
-
- public static String ListEntriesEditPage_Description;
-
- public static String OverviewPage_page_id;
-
- public static String OverviewPage_page_title;
-
- public static String OverviewPage_PageflowOverview_summary;
-
- public static String OverviewPage_EditorSection_name;
-
- public static String OverviewPage_EditorSection_description;
-
- public static String OverviewPage_EditorSection_noplugin;
-
- public static String OverviewPage_EditorSection_nooverview;
-
- public static String OverviewPage_EditorSection_Help_HelpContextID;
-
- public static String OverviewPage_EditorSection_Help_HelpToolTip;
-
- public static String OverviewPage_GeneralSection_name;
-
- public static String OverviewPage_GeneralSection_description;
-
- public static String OverviewPage_GeneralSection_label_name;
-
- public static String OverviewPage_GeneralSection_label_version;
-
- public static String OverviewPage_GeneralSection_Help_HelpContextID;
-
- public static String OverviewPage_GeneralSection_Help_HelpToolTip;
-
- public static String OverviewPage_NavigationSection_name;
-
- public static String OverviewPage_NavigationSection_description;
-
- public static String OverviewPage_NavigationSection_table_col1;
-
- public static String OverviewPage_NavigationSection_table_col2;
-
- public static String OverviewPage_NavigationSection_table_col3;
-
- public static String OverviewPage_NavigationSection_pageflowPageID;
-
- public static String OverviewPage_NavigationSection_Help_HelpContextID;
-
- public static String OverviewPage_NavigationSection_Help_HelpToolTip;
-
- public static String OverviewPage_ManagedBeanSection_name;
-
- public static String OverviewPage_ManagedBeanSection_description;
-
- public static String OverviewPage_ManagedBeanSection_table_namecol;
-
- public static String OverviewPage_ManagedBeanSection_table_scopecol;
-
- public static String OverviewPage_ManagedBeanSection_table_classcol;
-
- public static String OverviewPage_ManagedBeanSection_managedbeanPageID;
-
- public static String OverviewPage_ManagedBeanSection_Help_HelpContextID;
-
- public static String OverviewPage_ManagedBeanSection_Help_HelpToolTip;
-
- public static String OverviewPage_ComponentsSection_name;
-
- public static String OverviewPage_ComponentsSection_description;
-
- public static String OverviewPage_ComponentsSection_table_typecol;
-
- public static String OverviewPage_ComponentsSection_table_namecol;
-
- public static String OverviewPage_ComponentsSection_componentsPageID;
-
- public static String OverviewPage_ComponentsSection_Help_HelpContextID;
-
- public static String OverviewPage_ComponentsSection_Help_HelpToolTip;
-
- public static String OverviewPage_OthersSection_name;
-
- public static String OverviewPage_OthersSection_description;
-
- public static String OverviewPage_OthersSection_table_typecol;
-
- public static String OverviewPage_OthersSection_table_namecol;
-
- public static String OverviewPage_OthersSection_table_valuecol;
-
- public static String OverviewPage_OthersSection_othersPageID;
-
- public static String OverviewPage_OthersSection_Help_HelpContextID;
-
- public static String OverviewPage_OthersSection_Help_HelpToolTip;
-
- public static String ManagedBeanPropertyGroup_error_EmptyName;
-
- public static String ManagedBeanPropertyGroup_error_EmptyClass;
-
- public static String MapEntriesEditGroup_Edit;
-
- public static String MapEntriesEditPage_Title;
-
- public static String MapEntriesWizard_Title;
-
- public static String MapEntryEditGroup_Key;
-
- public static String MapEntryEditGroup_error_EmptyKey;
-
- public static String MapEntryEditGroup_error_DuplicateKey;
-
- public static String MapEntryEditPage_Title;
-
- public static String MapEntryEditWizard_Title;
-
- public static String MapEntriesEditPage_Description;
-
- public static String MapEntryEditPage_Description;
-
- public static String ValueEditDialog_Title;
-
- public static String ValueEditWizard_Title;
-
- public static String ValueEditPage_Description;
-
- public static String ValueEditGroup_Value;
-
- public static String ValueEditPage_Title;
-
- public static String ComponentsPage_Title;
-
- public static String ComponentMasterSection_Name;
-
- public static String ComponentMasterSection_Description;
-
- public static String ComponentMasterSection_HelpContextID;
-
- public static String ComponentMasterSection_HelpToolTip;
-
- public static String ComponentGeneralSection_Name;
-
- public static String ComponentGeneralSection_Description;
-
- public static String ComponentGeneralSection_HelpContextID;
-
- public static String ComponentGeneralSection_HelpToolTip;
-
- public static String ComponentGeneralSection_Label_DisplayName;
-
- public static String ComponentGeneralSection_Label_Description;
-
- public static String ComponentGeneralSection_Label_ComponentType;
-
- public static String ComponentGeneralSection_Label_ComponentClass;
-
- public static String RenderKitMasterSection_Name;
-
- public static String RenderKitMasterSection_Description;
-
- public static String RenderKitMasterSection_HelpContextID;
-
- public static String RenderKitMasterSection_HelpToolTip;
-
- public static String RenderKitGeneralSection_Name;
-
- public static String RenderKitGeneralSection_Description;
-
- public static String RenderKitGeneralSection_HelpContextID;
-
- public static String RenderKitGeneralSection_HelpToolTip;
-
- public static String RenderKitGeneralSection_Label_DisplayName;
-
- public static String RenderKitGeneralSection_Label_Description;
-
- public static String RenderKitGeneralSection_Label_RenderKitID;
-
- public static String RenderKitGeneralSection_Label_RenderKitClass;
-
- public static String RendererSection_Name;
-
- public static String RendererSection_Description;
-
- public static String RendererSection_HelpContextID;
-
- public static String RendererSection_HelpToolTip;
-
- public static String RendererSection_Table_NameColumn;
-
- public static String RendererSection_Table_ComponentFamilyColumn;
-
- public static String RendererSection_Table_TypeColumn;
-
- public static String RendererSection_Table_ClassColumn;
-
- public static String RendererSection_Dialog_Title_Add;
-
- public static String RendererSection_Dialog_Title_Edit;
-
- public static String RendererSection_Dialog_Tab_General;
-
- public static String RendererSection_Dialog_DisplayName;
-
- public static String RendererSection_Dialog_ComponentFamilyValue;
-
- public static String RendererSection_Dialog_TypeValue;
-
- public static String RendererSection_Dialog_RendererClass;
-
- public static String RendererSection_Dialog_Error_ComponentFamilyEmpty;
-
- public static String RendererSection_Dialog_Error_RendererTypeEmpty;
-
- public static String RendererSection_Dialog_Error_RendererClassEmpty;
-
- public static String RendererSection_Dialog_SelectComponentFamilyDialog_Title;
-
- public static String RendererSection_Dialog_ComponentFamilyCaption;
-
- public static String RendererSection_Dialog_ComponentFamilyLabel;
-
- public static String ConverterMasterSection_Name;
-
- public static String ConverterMasterSection_Description;
-
- public static String ConverterMasterSection_HelpContextID;
-
- public static String ConverterMasterSection_HelpToolTip;
-
- public static String ConverterGeneralSection_Name;
-
- public static String ConverterGeneralSection_Description;
-
- public static String ConverterGeneralSection_HelpContextID;
-
- public static String ConverterGeneralSection_HelpToolTip;
-
- public static String ConverterGeneralSection_Label_DisplayName;
-
- public static String ConverterGeneralSection_Label_Description;
-
- public static String ConverterGeneralSection_Label_ConverterID;
-
- public static String ConverterGeneralSection_Label_ConverterForClass;
-
- public static String ConverterGeneralSection_Label_ConverterClass;
-
- public static String ValidatorMasterSection_Name;
-
- public static String ValidatorMasterSection_Description;
-
- public static String ValidatorMasterSection_HelpContextID;
-
- public static String ValidatorMasterSection_HelpToolTip;
-
- public static String ValidatorGeneralSection_Name;
-
- public static String ValidatorGeneralSection_Description;
-
- public static String ValidatorGeneralSection_HelpContextID;
-
- public static String ValidatorGeneralSection_HelpToolTip;
-
- public static String ValidatorGeneralSection_Label_DisplayName;
-
- public static String ValidatorGeneralSection_Label_Description;
-
- public static String ValidatorGeneralSection_Label_ValidatorID;
-
- public static String ValidatorGeneralSection_Label_ValidatorClass;
-
- public static String AttributeSection_Name;
-
- public static String AttributeSection_Description;
-
- public static String AttributeSection_HelpContextID;
-
- public static String AttributeSection_HelpToolTip;
-
- public static String AttributeSection_Table_NameColumn;
-
- public static String AttributeSection_Table_ClassColumn;
-
- public static String AttributeSection_Table_DefaultValueColumn;
-
- public static String AttributeSection_Table_SuggestedValueColumn;
-
- public static String AttributeSection_Dialog_Title_Add;
-
- public static String AttributeSection_Dialog_Title_Edit;
-
- public static String AttributeSection_Dialog_Tab_General;
-
- public static String AttributeSection_Dialog_AttributeName;
-
- public static String AttributeSection_Dialog_AttributeClass;
-
- public static String AttributeSection_Dialog_DefaultValue;
-
- public static String AttributeSection_Dialog_SuggestedValue;
-
- public static String AttributeSection_Dialog_Error_NameEmpty;
-
- public static String AttributeSection_Dialog_Error_ClassEmpty;
-
- public static String PropertySection_Name;
-
- public static String PropertySection_Description;
-
- public static String PropertySection_HelpContextID;
-
- public static String PropertySection_HelpToolTip;
-
- public static String PropertySection_Table_NameColumn;
-
- public static String PropertySection_Table_ClassColumn;
-
- public static String PropertySection_Table_DefaultValueColumn;
-
- public static String PropertySection_Table_SuggestedValueColumn;
-
- public static String PropertySection_Dialog_Title_Add;
-
- public static String PropertySection_Dialog_Title_Edit;
-
- public static String PropertySection_Dialog_Tab_General;
-
- public static String PropertySection_Dialog_PropertyName;
-
- public static String PropertySection_Dialog_PropertyClass;
-
- public static String PropertySection_Dialog_DefaultValue;
-
- public static String PropertySection_Dialog_SuggestedValue;
-
- public static String PropertySection_Dialog_Error_NameEmpty;
-
- public static String PropertySection_Dialog_Error_ClassEmpty;
-
- public static String FacetSection_Name;
-
- public static String FacetSection_Description;
-
- public static String FacetSection_HelpContextID;
-
- public static String FacetsSection_HelpToolTip;
-
- public static String FacetSection_Table_DisplayNameColumn;
-
- public static String FacetSection_Table_FacetNameColumn;
-
- public static String FacetSection_Table_DescriptionColumn;
-
- public static String FacetSection_Dialog_Title_Add;
-
- public static String FacetSection_Dialog_Title_Edit;
-
- public static String FacetSection_Dialog_Tab_General;
-
- public static String FacetSection_Dialog_FacetName;
-
- public static String FacetSection_Dialog_DisplayName;
-
- public static String FacetSection_Dialog_Description;
-
- public static String FacetSection_Dialog_Error_NameEmpty;
-
- public static String OthersPage_Title;
-
- public static String ActionListenerSection_Name;
-
- public static String ActionListenerSection_Description;
-
- public static String ActionListenerSection_HelpContextID;
-
- public static String ActionListenerSection_HelpToolTip;
-
- public static String MessageBundleSection_Name;
-
- public static String MessageBundleSection_Description;
-
- public static String MessageBundleSection_HelpContextID;
-
- public static String MessageBundleSection_HelpToolTip;
-
- public static String MessageBundleSection_Dialog_Title;
-
- public static String MessageBundleSection_Dialog_Message_SelectPropertyFile;
-
- public static String MessageBundleSection_Dialog_Message_AlreadyExists;
-
- public static String LocaleConfigSection_Name;
-
- public static String LocaleConfigSection_Description;
-
- public static String LocaleConfigSection_HelpContextID;
-
- public static String LocaleConfigSection_HelpToolTip;
-
- public static String LocaleConfigSection_Wizard_WindowTitle;
-
- public static String LocaleConfigSection_Wizard_Page_Name;
-
- public static String LocaleConfigSection_Wizard_Page_Title;
-
- public static String LocaleConfigSection_Wizard_Page_Description;
-
- public static String LocaleConfigSection_Wizard_Page_LabelText;
-
- public static String LocaleConfigSection_Wizard_Page_AlreadyExistsError;
-
- public static String DefaultRenderKitIDSection_Name;
-
- public static String DefaultRenderKitIDSection_Description;
-
- public static String DefaultRenderKitIDSection_HelpContextID;
-
- public static String DefaultRenderKitIDSection_HelpToolTip;
-
- public static String DefaultRenderKitIDSection_Wizard_WindowTitle;
-
- public static String DefaultRenderKitIDSection_Wizard_Page_Name;
-
- public static String DefaultRenderKitIDSection_Wizard_Page_Title;
-
- public static String DefaultRenderKitIDSection_Wizard_Page_Description;
-
- public static String DefaultRenderKitIDSection_Wizard_Page_LabelText;
-
- public static String DefaultRenderKitIDSection_Wizard_Page_AlreadyExistsError;
-
- public static String NavigationHandlerSection_Name;
-
- public static String NavigationHandlerSection_Description;
-
- public static String NavigationHandlerSection_HelpContextID;
-
- public static String NavigationHandlerSection_HelpToolTip;
-
- public static String ViewHandlerSection_Name;
-
- public static String ViewHandlerSection_Description;
-
- public static String ViewHandlerSection_HelpContextID;
-
- public static String ViewHandlerSection_HelpToolTip;
-
- public static String StateManagerSection_Name;
-
- public static String StateManagerSection_Description;
-
- public static String StateManagerSection_HelpContextID;
-
- public static String StateManagerSection_HelpToolTip;
-
- public static String PropertyResolverSection_Name;
-
- public static String PropertyResolverSection_Description;
-
- public static String PropertyResolverSection_HelpContextID;
-
- public static String PropertyResolverSection_HelpToolTip;
-
- public static String VariableResolverSection_Name;
-
- public static String VariableResolverSection_Description;
-
- public static String VariableResolverSection_HelpContextID;
-
- public static String VariableResolverSection_HelpToolTip;
-
- public static String ApplicationFactorySection_Name;
-
- public static String ApplicationFactorySection_Description;
-
- public static String ApplicationFactorySection_HelpContextID;
-
- public static String ApplicationFactorySection_HelpToolTip;
-
- public static String FacesContextFactorySection_Name;
-
- public static String FacesContextFactorySection_Description;
-
- public static String FacesContextFactorySection_HelpContextID;
-
- public static String FacesContextFactorySection_HelpToolTip;
-
- public static String LifecycleFactorySection_Name;
-
- public static String LifecycleFactorySection_Description;
-
- public static String LifecycleFactorySection_HelpContextID;
-
- public static String LifecycleFactorySection_HelpToolTip;
-
- public static String RenderKitFactorySection_Name;
-
- public static String RenderKitFactorySection_Description;
-
- public static String RenderKitFactorySection_HelpContextID;
-
- public static String RenderKitFactorySection_HelpToolTip;
-
- public static String PhaseListenerSection_Name;
-
- public static String PhaseListenerSection_Description;
-
- public static String PhaseListenerSection_HelpContextID;
-
- public static String PhaseListenerSection_HelpToolTip;
-
- public static String MultiPageEditorOutlinePage_noOutline;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
deleted file mode 100644
index cbc3432c0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
+++ /dev/null
@@ -1,481 +0,0 @@
-####################################################
-# Common UI resources
-####################################################
-UI_Button_Add = Add
-UI_Button_Edit = Edit
-UI_Button_Remove = Remove
-UI_Button_Add_more = Add...
-UI_Button_Edit_more = Edit...
-
-##Message for remove confirm alerter.
-Remove_Title = Confirm Remove
-Remove_Msg = Are you sure you want to remove {0}?
-
-FindType = Find Type
-FindType_Filter = Choose a type (?=any character, *=any string):
-FindType_Error_CannotFindType = Can not find java class
-
-
-
-####################################################
-# Tab's name for multipageeditor of faces-config
-####################################################
-FacesConfigEditor_Introduction_TabName = Introduction
-FacesConfigEditor_Overview_TabName = Overview
-FacesConfigEditor_Pageflow_TabName = Navigation
-FacesConfigEditor_ManagedBeans_TabName = ManagedBean
-FacesConfigEditor_Components_TabName = Component
-FacesConfigEditor_Others_TabName = Others
-FacesConfigEditor_Source_TabName = Source
-
-
-####################################################
-#Introduction page
-####################################################
-editor_pageflow_page_intro_name = Introduction
-editor_pageflow_page_intro_title = Faces Configuration Introduction
-editor_pageflow_page_intro_help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_introduction
-editor_pageflow_page_intro_help_HelpToolTip = Introduction
-
-####################################################
-#ManagedBean page
-####################################################
-ManagedBeanPage_Title = Faces Configuration Managed Bean
-
-##managed bean section
-ManagedBeanMasterSection_Name = Managed Bean Elements
-ManagedBeanMasterSection_Description = The following managed beans are defined
-ManagedBeanMasterSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_managedbeans
-ManagedBeanMasterSection_HelpToolTip = ManagedBean
-
-
-##managed bean general section
-ManagedBeanGeneralSection_Name = Managed Bean
-
-ManagedBeanGeneralSection_Desc = This section describes general configuration of this managed bean
-ManagedBeanGeneralSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_managedbeans_general
-ManagedBeanGeneralSection_HelpToolTip = Managed Bean General Information
-
-ManagedBeanGeneralSection_ManagedBeanName = Managed Bean name*:
-ManagedBeanGeneralSection_ManagedBeanClass = Managed Bean class*:
-ManagedBeanGeneralSection_ManagedBeanScope = Managed Bean scope*:
-
-##managed bean initialization section
-InitializationSection_Name = Initialization
-InitializationSection_Description = You can initialize the managed bean's properties or itself if it is a subclass of java.util.Map or java.util.List
-InitializationSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_managedbeans_initialization
-InitializationSection_HelpToolTip = Managed Bean Initialization
-
-ManagedBeanPropertyEditDialog_Title_NewPropertyEntry = Create New Property
-ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry = Edit Existing Property
-ManagedBeanPropertyEditDialog_PropertyName = Property name*:
-ManagedBeanPropertyEditDialog_PropertyClass = Property class*:
-ManagedBeanPropertyEditDialog_PropertyClass_Browse = Browse...
-ManagedBeanPropertyEditDialog_ValueType = Value type:
-ManagedBeanProeprtyEditPage_Description = Editing managed bean property.
-ManagedBeanPropertyEditDialog_Value = Value:
-ManagedBeanPropertyEditWizard_Title = Editing Managed Bean Property
-ManagedBeanProeprtyEditPage_Title = Edit Property
-ManagedBeanPropertyEditDialog_Value_Change = Edit...
-
-ManagedBeanPropertyEditDialog_FindType = Find Type
-ManagedBeanPropertyEditDialog_FindType_Filter = Choose a type (?=any character, *=any string):
-
-InitializationSection_ClassType = Managed Bean class type:
-
-InitializationSection_ClassType_General = General class
-InitializationSection_ClassType_Map = Map
-InitializationSection_ClassType_List = List
-
-InitializationSection_PropertyTable_Name = Name
-InitializationSection_PropertyTable_Class = Class
-InitializationSection_PropertyTable_Value = Value
-
-InitializationSection_MapType_KeyClass = Key class:
-InitializationSection_MapType_ValueClass = Value class:
-
-InitializationSection_MapTable_Title = Values:
-InitializationSection_MapTable_Key = Key
-
-InitializationSection_MapTable_Value = Value
-
-InitializationSection_ListType_ValueClass = Value class:
-InitializationSection_ListTable_Title = Values:
-InitializationSection_ListTable_Value = Value
-
-
-##ListEntriesEditGroup
-ListEntriesEditPage_Title = Editing list-entries
-ListEntriesWizard_Title = Editing list-entries
-ListEntriesEditPage_Description = Editing list-entries of managed bean property.
-
-
-
-####################################################
-#Overview Page
-####################################################
-#OverviewPage.help = Help
-OverviewPage_page_id = PageflowOverview
-OverviewPage_page_title = PageFlow Overview
-OverviewPage_PageflowOverview_summary = Faces Configuration Overview
-
-# editor section
-OverviewPage_EditorSection_name = Editors Information
-OverviewPage_EditorSection_description = This section information about editors
-OverviewPage_EditorSection_noplugin = No plugin.xml file
-OverviewPage_EditorSection_nooverview = No Overview section found in plugin.xml file
-OverviewPage_EditorSection_Help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_overview_editor
-OverviewPage_EditorSection_Help_HelpToolTip = Editors
-
-# general section
-OverviewPage_GeneralSection_name = General information of faces-config.xml
-OverviewPage_GeneralSection_description = This section describes general information
-OverviewPage_GeneralSection_label_name = Faces Config Name:
-OverviewPage_GeneralSection_label_version = Version:
-OverviewPage_GeneralSection_Help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_overview_general
-OverviewPage_GeneralSection_Help_HelpToolTip = General
-
-#navigation section
-OverviewPage_NavigationSection_name = Navigation Information
-OverviewPage_NavigationSection_description = This section describes the navigation rules
-OverviewPage_NavigationSection_table_col1 = From View ID
-OverviewPage_NavigationSection_table_col2 = From Outcome
-OverviewPage_NavigationSection_table_col3 = To View ID
-OverviewPage_NavigationSection_pageflowPageID = org.eclipse.wtp.jsf.facesconfig.editor.pageflow.PageflowEditor
-OverviewPage_NavigationSection_Help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_overview_navigation
-OverviewPage_NavigationSection_Help_HelpToolTip = Navigation
-
-# managed bean section
-OverviewPage_ManagedBeanSection_name = ManagedBean Information
-OverviewPage_ManagedBeanSection_description = This section describes the managed beans
-OverviewPage_ManagedBeanSection_table_namecol = Name
-OverviewPage_ManagedBeanSection_table_scopecol = Scope
-OverviewPage_ManagedBeanSection_table_classcol = Class
-OverviewPage_ManagedBeanSection_managedbeanPageID = com.sybase.stf.jmt.editors.pageflow.managedbean.DataBindingPage
-OverviewPage_ManagedBeanSection_Help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_overview_managedbean
-OverviewPage_ManagedBeanSection_Help_HelpToolTip = Managed Bean
-#components section
-OverviewPage_ComponentsSection_name = Component Information
-OverviewPage_ComponentsSection_description = This section describes component, render-kit, converter and validator elements
-OverviewPage_ComponentsSection_table_typecol = Element Type
-OverviewPage_ComponentsSection_table_namecol = Element Name
-OverviewPage_ComponentsSection_componentsPageID = com.sybase.stf.jmt.editors.pageflow.components.ComponentsPage
-OverviewPage_ComponentsSection_Help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_overview_component
-OverviewPage_ComponentsSection_Help_HelpToolTip = Component
-
-#other section
-OverviewPage_OthersSection_name = Others Information
-OverviewPage_OthersSection_description = This section describes application, factory and lifecycle elements
-OverviewPage_OthersSection_table_typecol = Element Type
-OverviewPage_OthersSection_table_namecol = Element Name
-OverviewPage_OthersSection_table_valuecol = Element Value
-OverviewPage_OthersSection_othersPageID = com.sybase.stf.jmt.editors.pageflow.OthersPage
-OverviewPage_OthersSection_Help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_overview_others
-OverviewPage_OthersSection_Help_HelpToolTip = Others
-
-ManagedBeanPropertyGroup_error_EmptyName = The property name should be selected.
-ManagedBeanPropertyGroup_error_EmptyClass = The property class should be selected or input.
-MapEntriesEditGroup_Edit = Edit...
-MapEntriesEditPage_Title = Editing map-entries
-MapEntriesWizard_Title = Editing map-entries
-MapEntryEditGroup_Key = Key*:
-MapEntryEditGroup_error_EmptyKey = The key is empty.
-MapEntryEditGroup_error_DuplicateKey = The key ''{0}'' is duplicated.
-
-
-MapEntryEditPage_Title = Edit map-entry
-MapEntryEditWizard_Title = Edit Map Entry
-MapEntriesEditPage_Description = Editing map-entries of managed bean property.
-MapEntryEditPage_Description = Editing map-entry of managed bean property.
-ValueEditDialog_Title = Edit Value
-ValueEditWizard_Title = Edit Value
-ValueEditPage_Description = Editing value of managed bean property.
-ValueEditGroup_Value = Value:
-ValueEditPage_Title = Edit Value
-
-####################################################
-#Components page
-####################################################
-ComponentsPage_Title = Faces Configuration Components
-
-##Component Master Section
-ComponentMasterSection_Name = Components
-ComponentMasterSection_Description = The following components are defined:
-ComponentMasterSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_component
-ComponentMasterSection_HelpToolTip = Component
-
-
-##Components General Section
-ComponentGeneralSection_Name = General
-ComponentGeneralSection_Description = This section describes the general information of this component.
-ComponentGeneralSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_component_general
-ComponentGeneralSection_HelpToolTip = ComponentGeneral
-ComponentGeneralSection_Label_DisplayName = Display Name:
-ComponentGeneralSection_Label_Description = Description:
-ComponentGeneralSection_Label_ComponentType = Component Type*:
-ComponentGeneralSection_Label_ComponentClass = Component Class*:
-
-##RenderKit Master Section
-RenderKitMasterSection_Name = Render Kits
-RenderKitMasterSection_Description = The following render-kits are defined:
-RenderKitMasterSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_renderkit
-RenderKitMasterSection_HelpToolTip = RenderKit
-
-
-##RenderKits General Section
-RenderKitGeneralSection_Name = General
-RenderKitGeneralSection_Description = This section describes the general information of this render-kit.
-RenderKitGeneralSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_renderkit_general
-RenderKitGeneralSection_HelpToolTip = RenderKitGeneral
-RenderKitGeneralSection_Label_DisplayName = Display Name:
-RenderKitGeneralSection_Label_Description = Description:
-RenderKitGeneralSection_Label_RenderKitID = Renderkit ID:
-RenderKitGeneralSection_Label_RenderKitClass = Renderkit Class:
-
-##Renderer Section
-RendererSection_Name = Renderers
-RendererSection_Description = This section lists all the renderers of this render-kit.
-RendererSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_renderkit_renderer
-RendererSection_HelpToolTip = RenderKitRenderer
-RendererSection_Table_NameColumn = Name
-RendererSection_Table_ComponentFamilyColumn = Component Family
-RendererSection_Table_TypeColumn = Type
-RendererSection_Table_ClassColumn = Class
-
-##Add/Edit Renderer Dialog
-RendererSection_Dialog_Title_Add = Add Renderer
-RendererSection_Dialog_Title_Edit = Edit Renderer
-RendererSection_Dialog_Tab_General = General
-RendererSection_Dialog_DisplayName = Display Name:
-RendererSection_Dialog_ComponentFamilyValue = Component Family*:
-RendererSection_Dialog_TypeValue = Renderer Type*:
-RendererSection_Dialog_RendererClass = Renderer Class*:
-RendererSection_Dialog_Error_ComponentFamilyEmpty = The component family is empty.
-RendererSection_Dialog_Error_RendererTypeEmpty = The renderer type is empty.
-RendererSection_Dialog_Error_RendererClassEmpty = The renderer class is empty.
-
-RendererSection_Dialog_SelectComponentFamilyDialog_Title = Select Component Family
-#RendererSection.Dialog.Page.SelectComponentFamilyDialogPage.Title = Select Component Family
-#RendererSection.Dialog.Page.SelectComponentFamilyDialogPage.Description = Enter or select a component family.
-#RendererSection.Dialog.Page.SelectComponentFamilyDialogPage.LabelText = Enter or select a component family:
-RendererSection_Dialog_ComponentFamilyCaption = Select Component Family
-RendererSection_Dialog_ComponentFamilyLabel = Enter or select a component family:
-##Converter Master Section
-ConverterMasterSection_Name = Converters
-ConverterMasterSection_Description = The following Converters are defined:
-ConverterMasterSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_converter
-ConverterMasterSection_HelpToolTip = Converter
-
-
-##Converter General Section
-ConverterGeneralSection_Name = General
-ConverterGeneralSection_Description = This section describes the general information of this converter.
-ConverterGeneralSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_converter_general
-ConverterGeneralSection_HelpToolTip = ConverterGeneral
-ConverterGeneralSection_Label_DisplayName = Display Name:
-ConverterGeneralSection_Label_Description = Description:
-ConverterGeneralSection_Label_ConverterID = Converter ID:
-ConverterGeneralSection_Label_ConverterForClass = or Converter For Class:
-ConverterGeneralSection_Label_ConverterClass = Converter Class*:
-
-##Validator Section
-ValidatorMasterSection_Name = Validators
-ValidatorMasterSection_Description = The following Validators are defined:
-ValidatorMasterSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_validator
-ValidatorMasterSection_HelpToolTip = Validator
-
-
-##Validator General Section
-ValidatorGeneralSection_Name = General
-ValidatorGeneralSection_Description = This section describes general information of this Validator
-ValidatorGeneralSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_validator_general
-ValidatorGeneralSection_HelpToolTip = ValidatorGeneral
-ValidatorGeneralSection_Label_DisplayName = Display Name:
-ValidatorGeneralSection_Label_Description = Description:
-ValidatorGeneralSection_Label_ValidatorID = Validator ID*:
-ValidatorGeneralSection_Label_ValidatorClass = Validator Class*:
-
-##Attribute Section
-AttributeSection_Name = Attributes
-AttributeSection_Description = This section lists all the attributes.
-AttributeSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_attribute
-AttributeSection_HelpToolTip = Attribute
-
-AttributeSection_Table_NameColumn = Name
-AttributeSection_Table_ClassColumn = Class
-AttributeSection_Table_DefaultValueColumn = Default Value
-AttributeSection_Table_SuggestedValueColumn = Suggested Value
-
-##Add/Edit Attribute Dialog
-AttributeSection_Dialog_Title_Add = Add Attribute
-AttributeSection_Dialog_Title_Edit = Edit Attribute
-AttributeSection_Dialog_Tab_General = General
-AttributeSection_Dialog_AttributeName = Attribute Name*:
-AttributeSection_Dialog_AttributeClass = Attribute Class*:
-AttributeSection_Dialog_DefaultValue = Default value:
-AttributeSection_Dialog_SuggestedValue = Suggested value:
-AttributeSection_Dialog_Error_NameEmpty = The attribute name is empty.
-AttributeSection_Dialog_Error_ClassEmpty = The attribute class is empty.
-
-##Property Section
-PropertySection_Name = Properties
-PropertySection_Description = This section lists all the properties.
-PropertySection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_property
-PropertySection_HelpToolTip = Property
-
-PropertySection_Table_NameColumn = Name
-PropertySection_Table_ClassColumn = Class
-PropertySection_Table_DefaultValueColumn = Default Value
-PropertySection_Table_SuggestedValueColumn = Suggested Value
-
-
-##Add/Edit Property Dialog
-PropertySection_Dialog_Title_Add = Add Property
-PropertySection_Dialog_Title_Edit = Edit Property
-PropertySection_Dialog_Tab_General = General
-PropertySection_Dialog_PropertyName = Property Name*:
-PropertySection_Dialog_PropertyClass = Property Class*:
-PropertySection_Dialog_DefaultValue = Default value:
-PropertySection_Dialog_SuggestedValue = Suggested value:
-PropertySection_Dialog_Error_NameEmpty = The property name is empty.
-PropertySection_Dialog_Error_ClassEmpty = The property class is empty.
-
-##Facet Section
-FacetSection_Name = Facets
-FacetSection_Description = This section lists all the facets.
-FacetSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_components_facet
-FacetsSection_HelpToolTip = Facet
-
-FacetSection_Table_DisplayNameColumn = Display Name
-FacetSection_Table_FacetNameColumn = Facet Name
-FacetSection_Table_DescriptionColumn = Description
-
-FacetSection_Dialog_Title_Add = Add Facet
-FacetSection_Dialog_Title_Edit = Edit Facet
-FacetSection_Dialog_Tab_General = General
-FacetSection_Dialog_FacetName = Facet Name*:
-FacetSection_Dialog_DisplayName = Display Name:
-FacetSection_Dialog_Description = Description:
-FacetSection_Dialog_Error_NameEmpty = The facet name is empty.
-
-####################################################
-#Others page
-####################################################
-OthersPage_Title = Faces Configuration Others
-
-##Application ActionListener Section
-ActionListenerSection_Name = Action Listener
-ActionListenerSection_Description =
-ActionListenerSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_actionlistener
-ActionListenerSection_HelpToolTip = ActionListener
-
-
-##Application Message Bundle Section
-MessageBundleSection_Name = Message Bundle
-MessageBundleSection_Description =
-MessageBundleSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_messagebundle
-MessageBundleSection_HelpToolTip = MessageBundle
-
-
-MessageBundleSection_Dialog_Title = Select Message Bundle
-MessageBundleSection_Dialog_Message_SelectPropertyFile = Please select a message bundle file.
-MessageBundleSection_Dialog_Message_AlreadyExists = This message bundle already exists.
-
-##Application Locale Config Section
-LocaleConfigSection_Name = Locale Config
-LocaleConfigSection_Description =
-LocaleConfigSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_localeconfig
-LocaleConfigSection_HelpToolTip = LocaleConfig
-
-LocaleConfigSection_Wizard_WindowTitle = Add New Locale
-LocaleConfigSection_Wizard_Page_Name = addLocalePage
-LocaleConfigSection_Wizard_Page_Title = Add Supported Locale
-LocaleConfigSection_Wizard_Page_Description =
-LocaleConfigSection_Wizard_Page_LabelText = Enter or select a locale:
-LocaleConfigSection_Wizard_Page_AlreadyExistsError = This locale already exists.
-
-##Application Default RenderKit ID Section
-DefaultRenderKitIDSection_Name = Default RenderKit ID
-DefaultRenderKitIDSection_Description =
-DefaultRenderKitIDSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_defaultrenderkitid
-DefaultRenderKitIDSection_HelpToolTip = DefaultRenderKitID
-
-
-DefaultRenderKitIDSection_Wizard_WindowTitle = Add Default Render Kit ID
-DefaultRenderKitIDSection_Wizard_Page_Name = addDefaultRenderKitIDPage
-DefaultRenderKitIDSection_Wizard_Page_Title = Add Default Render Kit ID
-DefaultRenderKitIDSection_Wizard_Page_Description =
-DefaultRenderKitIDSection_Wizard_Page_LabelText = Enter or select a render kit id:
-DefaultRenderKitIDSection_Wizard_Page_AlreadyExistsError = This render kit ID already exists.
-
-##Application Navigation Handler Section
-NavigationHandlerSection_Name = Navigation Handler
-NavigationHandlerSection_Description =
-NavigationHandlerSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_navigationhandler
-NavigationHandlerSection_HelpToolTip = NavigationHandler
-
-
-##Application View Handler Section
-ViewHandlerSection_Name = View Handler
-ViewHandlerSection_Description =
-ViewHandlerSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_viewhandler
-ViewHandlerSection_HelpToolTip = ViewHandler
-
-
-##Application State Manager Section
-StateManagerSection_Name = State Manager
-StateManagerSection_Description =
-StateManagerSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_statemanager
-StateManagerSection_HelpToolTip = StateManager
-
-
-##Application Property Resolver Section
-PropertyResolverSection_Name = Property Resolver
-PropertyResolverSection_Description =
-PropertyResolverSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_propertyresolver
-PropertyResolverSection_HelpToolTip = PropertyResolver
-
-##Application Variable Resolver Section
-VariableResolverSection_Name = Variable Resolver
-VariableResolverSection_Description =
-VariableResolverSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_variableresolver
-VariableResolverSection_HelpToolTip = VariableResolver
-
-
-##Factory Application Factory Section
-ApplicationFactorySection_Name = Application Factory
-ApplicationFactorySection_Description =
-ApplicationFactorySection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_applicationfactory
-ApplicationFactorySection_HelpToolTip = ApplicationFactory
-
-
-##Factory Faces Context Factory Section
-FacesContextFactorySection_Name = Faces Context Factory
-FacesContextFactorySection_Description =
-FacesContextFactorySection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_facescontextfactory
-FacesContextFactorySection_HelpToolTip = FacesContextFactory
-
-
-##Factory Lifecycle Factory Section
-LifecycleFactorySection_Name = Lifecycle Factory
-LifecycleFactorySection_Description =
-LifecycleFactorySection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_lifecyclefactory
-LifecycleFactorySection_HelpToolTip = LifecycleFactory
-
-
-##Factory Render Kit Factory Section
-RenderKitFactorySection_Name = Render Kit Factory
-RenderKitFactorySection_Description =
-RenderKitFactorySection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_renderkitfactory
-RenderKitFactorySection_HelpToolTip = RenderKitFactory
-
-##LifeCycle Phase Listener Section
-PhaseListenerSection_Name = Phase Listener
-PhaseListenerSection_Description =
-PhaseListenerSection_HelpContextID = com.sybase.stf.jmt.faces_config_editor_others_phaselistener
-PhaseListenerSection_HelpToolTip = PhaseListener
-
-####################################################
-#Resource for MultiPageEditorOutlinePage
-####################################################
-MultiPageEditorOutlinePage_noOutline = An outline is not available.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java
deleted file mode 100644
index c015bc30c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.Alerts;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EditorPlugin extends AbstractUIPlugin {//implements IStartup {
-
- // The shared instance.
- private static EditorPlugin plugin;
-
- private Logger log;
-
- private ResourceBundle resourceBundle;
-
- private static Alerts alerts;
-
- private URL pluginBase;
-
- /**
- * The constructor.
- */
- public EditorPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- try {
- // get resource bundle.
- resourceBundle = ResourceBundle
- .getBundle("org.eclipse.jst.jsf.facesconfig.ui.EditorPluginResources");
- alerts = new Alerts(this, resourceBundle);
- pluginBase = getBundle().getEntry("/");
-
- // set up logging for this plugin and everthing under it.
- log = new Logger(this.getBundle(), resourceBundle);
-
- // log.info("log.StartMessage", CommonPlugin.getVersion());
- } catch (Exception ee) {
- // only log if the logger was configured correctly.
- if (log != null) {
- log.error("log.msg",
- "Problems starting plug-in Faces Config Editor.", ee);
- }
-
- throw new CoreException(new Status(IStatus.ERROR, getBundle()
- .getSymbolicName(), IStatus.OK,
- "Problems starting plug-in Faces Config Editor", ee));
- }
-
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static EditorPlugin getDefault() {
- return plugin;
- }
-
- /**
- * get the alerts objects associated with this plugin for alerting the user.
- *
- * @return
- */
- public static Alerts getAlerts() {
- return alerts;
- }
-
- /**
- * Returns a logger for the new class using this plugin for reference.
- */
- public static Logger getLogger(Class theClass) {
- return getDefault().getRootLogger(); // .getLogger(theClass);
- }
-
- /**
- * Returns the plugin's root logger
- */
- public Logger getRootLogger() {
- return log;
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the standard display to be used. The method first checks, if the
- * thread calling this method has an associated dispaly. If so, this display
- * is returned. Otherwise the method returns the default display.
- */
- public static Display getStandardDisplay() {
- Display display;
- display = Display.getCurrent();
- if (display == null) {
- display = Display.getDefault();
- }
- return display;
- }
-
- /**
- * Returns the active workbench window.
- *
- * @return the active workbench window. this can be null but I've never seen
- * it.
- */
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- if (getDefault().getWorkbench() == null) {
- return null;
- } else {
- return getDefault().getWorkbench().getActiveWorkbenchWindow();
- }
- }
-
- public static Shell getActiveShell() {
- Shell shell = null;
- IWorkbenchWindow workbenchWindow = getActiveWorkbenchWindow();
- if (workbenchWindow.getShell() != null) {
- shell = workbenchWindow.getShell();
- } else {
- shell = new Shell();
- }
- return shell;
- }
-
- /**
- * Returns the active workbench page. Note that the active page may not be
- * the one that the user perceives as active in some situations so this
- * method of obtaining the activate page should only be used if no other
- * method is available.
- *
- * @return the active workbench page
- */
- public static IWorkbenchPage getActivePage() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window == null) {
- return null;
- }
- return window.getActivePage();
- }
-
- /**
- * Returns a shared image for the given name
- * <p>
- * Note: Images returned from this method will be automitically disposed of
- * when this plug-in shuts down. Callers must not dispose of these images
- * themselves.
- * </p>
- *
- * @param name
- * the image name found in /icons (with extension)
- * @return the image, null on error or not found.
- */
- public Image getImage(String name) {
- if (name == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- Image image = (Image) images.get(name);
- if (image == null) {
- try {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(
- pluginBase, "icons/" + name));
- images.put(name, id);
-
- image = images.get(name);
- } catch (MalformedURLException ee) {
- // log.EditorPlugin.image.error=Image {0} not found.
- log.error("log.msg", "log.EditorPlugin.image.error", name, ee);
- }
- }
- return image;
- }
-
- /**
- * Returns an image descriptor for the image file at the given plug-in
- * relative path.
- *
- * @param path
- * the path
- * @return the image descriptor
- */
- public ImageDescriptor getImageDescriptor(String path) {
- if (path == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- ImageDescriptor id = (ImageDescriptor) images.getDescriptor(path);
- if (id == null) {
- try {
- id = ImageDescriptor.createFromURL(new URL(pluginBase, "icons/"
- + path));
- images.put(path, id);
- } catch (MalformedURLException ee) {
- // log.EditorPlugin.image.error=Image {0} not found.
- log.error("log.msg", "log.EditorPlugin.image.error", path, ee);
- }
- }
- return id;
- }
-
- /**
- * Returns this plugin's unique identifier
- *
- * @retun this plugin's unique identifier
- *
- */
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- protected void initializeDefaultPluginPreferences() {
- new GEMPreferences();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties
deleted file mode 100644
index 6fbf23c7e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties
+++ /dev/null
@@ -1,75 +0,0 @@
-common.error=Error
-common.warning=Warning
-log.StartMessage=Faces Config Editor initialized on eclipse version {0}.
-####################################################
-# Resource message for Logging
-####################################################
-
-log.msg={0}
-
-log.EditorPlugin=Faces Config Editor Plugin initialized on eclipse version {0}.
-log.EditorPlugin.image.error=Image {0} not found.
-
-####################################################
-# Resource message for Alert
-####################################################
-
-Pageflow.PageflowEditor.Alert.errorOpenEditorTitle = Open Pageflow Error
-Pageflow.PageflowEditor.Alert.errorOpenEditorInfo = An error occured during opening the editor.
-Pageflow.PageflowEditor.Alert.errorSaveFileTitle = Save Pageflow Error
-Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current pageflow model could not be saved.
-Pageflow.PageflowEditor.Alert.nullModelManager = No model manager found for saving the file.
-Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open JSF File Error
-Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFInfo = The JSF file ''{0}'' does not exist.
-Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo = The 'from-view-id' of this link is not related to a web page. It can not be opened in an editor.
-
-Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFileTitle = Confirm
-Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFile = No jsp file is related with this page.
-
-Pageflow.PageflowEditor.Alert.syncWithFacesConfigTitle = Confirm
-Pageflow.PageflowEditor.Alert.syncWithFacesConfigInfo = Synchronizing with faces-config will update the current pageflow model! \nThis command CAN NOT undo. Are you sure?
-Pageflow.PageflowEditor.Alert.errorSyncPageflowModel = The current pageflow model could not be synchronized with the specified faces-config file.
-
-Pageflow.PageflowEditor.Alert.updateFacesConfigTitle = Confirm
-Pageflow.PageflowEditor.Alert.updateFacesConfigInfo = Update the related faces config file! are you sure?
-Pageflow.PageflowEditor.Alert.errorUpdateFacesConfig = The related faces-config file could not be updated!
-
-Pageflow.Transform.Alert.ResourceTitle = Resource Error
-Pageflow.Transform.Alert.LoadResourceError = Error loading resource
-Pageflow.Transform.Alert.SaveResourceError = Error saving resource
-
-Pageflow.PageflowEditor.Alert.DNDResourceTitle = Pageflow Creation Error
-Pageflow.PageflowEditor.Alert.ExistingPage = The web page {0} is already existed in current PageFlow.
-Pageflow.PageflowEditor.Alert.ExistingAction = The action {0} is already existed in current PageFlow.
-Pageflow.PageflowEditor.Alert.PageFromOtherProject = The web page {0} does not belong to current project.
-
-Pageflow.FacesConfig.Alert.ResourceTitle = Faces Configuration File Warning
-Pageflow.FacesConfig.Alert.LoadFileError = Invalid content in faces configuration file ''{0}''.
-Pageflow.FacesConfig.Alert.ErrorUpdateFacesConfigFromPageflow = Invalid content in faces configuration file. \nThe pageflow diagram can not be transformed.
-Pageflow.FacesConfig.Alert.SaveFileError = Failed to save faces configuration file ''{0}''.
-
-ManagedBeanInitializationSection.Remove.Title = Confirm Remove
-ManagedBeanInitializationSection.RemoveManagedProperty = Are you sure you want to remove all the managed-properties?
-ManagedBeanInitializationSection.RemoveMapEntries = Are you sure you want to remove map-entries?
-ManagedBeanInitializationSection.RemoveListEntries = Are you sure you want to remove list-entries?
-
-Alert.Error.CompletionProcessor.HTML.AttributeCompletionProp=No completions found
-Alert.Info.JSPPageEditorContributor.CreateAction.Message=Sample Action Executed
-
-Pageflow.PageflowEditor.Error.invalidPageflowFile = The specified input is not a valid pageflow.
-Pageflow.PageflowEditor.Error.invalidPageflowModel = The model in the pageflow file is not a valid pageflow model.
-Pageflow.PageflowEditor.Error.canNotOpenEditor4JSF = The jsf file can not be opened in the editor.
-Pageflow.PageflowEditor.Error.ResourceChange = Failed in the resource change.
-Pageflow.PageflowEditor.Error.canNotShowPropertyView = Failed to show property sheet view.
-Pageflow.PageflowEditor.Error.canNotShowPaletteView = Failed to show palette sheet view.
-
-Pageflow.PageflowResources.Error.invalidResourceBundle = The specified resource file is not a valid resourece bundle file.
-Pageflow.Transform.Resource.LoadError = Error loading resource {0}
-
-Pageflow.PageflowEditor.Error.UnableRemoveAllMarkers = Unable to remove all markers
-Pageflow.PageflowEditor.Error.UnableAddMarker = Unable to add a marker
-Pageflow.PageflowEditor.Error.UnableRemoveMarker = Unable to remove a marker
-Pageflow.PageflowEditor.Error.invalidMarkerAttribute = Unable to get marker's attribute
-
-PageflowEditor.Encoding.Unsupported = Unsupported Encoding.
-PageflowEditor.Transform.Error.GetPageflowFromFacesConfig = Failed to get pageflow model from faces-config'a navigation rule.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java
deleted file mode 100644
index d7c64dfc8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowActionBarContributor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.ui.internal.tabletree.SourcePageActionContributor;
-
-/**
- * The faces-config editor itself is composed by a set of pages. Each page has
- * its own action contributor. This FacesConfigActionBarContributor will work as
- * a proxy to delegate the action contributing to target nested action
- * contributor.
- *
- * @author hmeng
- */
-
-public class FacesConfigActionBarContributor extends
- MultiPageEditorActionBarContributor {
- protected SourcePageActionContributor sourceActionContributor = null;
-
- protected PageflowActionBarContributor pageflowActionContributor = null;
-
- protected EditingDomainActionBarContributor formbasedPageActionContributor = null;
-
- private IEditorPart activeNestedEditor;
-
- public FacesConfigActionBarContributor() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public void setActivePage(IEditorPart activeEditor) {
- if (activeEditor != activeNestedEditor) {
- if (getActionContributor(activeNestedEditor) != null) {
- getActionContributor(activeNestedEditor).setActiveEditor(
- activeEditor);
- }
- activeNestedEditor = activeEditor;
- EditorActionBarContributor activeContributor = getActionContributor(activeEditor);
- if (activeContributor != null)
- activeContributor.setActiveEditor(activeEditor);
- else
- super.setActiveEditor(activeEditor);
- updateActionBars();
- }
- }
-
- public void contributeToCoolBar(ICoolBarManager coolBarManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null)
- activeContributor.contributeToCoolBar(coolBarManager);
- }
-
- public void contributeToMenu(IMenuManager menuManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- activeContributor.contributeToMenu(menuManager);
- }
- }
-
- public void contributeToStatusLine(IStatusLineManager statusLineManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- activeContributor.contributeToStatusLine(statusLineManager);
- }
- }
-
- public void contributeToToolBar(IToolBarManager toolBarManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- activeContributor.contributeToToolBar(toolBarManager);
- }
- }
-
- public void dispose() {
- getFormbasedPageActionContributor().dispose();
- getPageflowActionContributor().dispose();
- getSourceActionContributor().dispose();
- }
-
- public IActionBars getActionBars() {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- return activeContributor.getActionBars();
- } else {
- return super.getActionBars();
- }
- }
-
- public IWorkbenchPage getPage() {
- // TODO Auto-generated method stub
- return super.getPage();
- }
-
- public void init(IActionBars bars, IWorkbenchPage page) {
- getPageflowActionContributor().init(bars, page);
- getSourceActionContributor().init(bars, page);
- getFormbasedPageActionContributor().init(bars, page);
- super.init(bars, page);
- }
-
- public void setActiveEditor(IEditorPart targetEditor) {
- if (activeNestedEditor != getActiveNestedEditor(targetEditor)) {
- activeNestedEditor = getActiveNestedEditor(targetEditor);
- setActivePage(activeNestedEditor);
- }
- }
-
- private IEditorPart getActiveNestedEditor(IEditorPart targetEditor) {
- IEditorPart activeNestedEditor;
- if (targetEditor instanceof FormEditor) {
- activeNestedEditor = ((FormEditor) targetEditor).getActiveEditor();
- } else {
- activeNestedEditor = targetEditor;
- }
- return activeNestedEditor;
- }
-
- private EditorActionBarContributor getActionContributor(
- IEditorPart activeNestedEditor) {
- EditorActionBarContributor activeContributor = null;
- if (activeNestedEditor instanceof PageflowEditor) {
- activeContributor = getPageflowActionContributor();
- } else if (activeNestedEditor instanceof StructuredTextEditor) {
- activeContributor = getSourceActionContributor();
- } else if (activeNestedEditor != null) {
- activeContributor = getFormbasedPageActionContributor();
- }
- return activeContributor;
- }
-
- public SourcePageActionContributor getSourceActionContributor() {
- if (sourceActionContributor == null) {
- sourceActionContributor = new SourcePageActionContributor();
- }
- return sourceActionContributor;
- }
-
- public EditingDomainActionBarContributor getFormbasedPageActionContributor() {
- if (formbasedPageActionContributor == null) {
- formbasedPageActionContributor = new MyEditingDomainActionContributor();
- }
- return formbasedPageActionContributor;
- }
-
- protected void declareGlobalActionKeys() {
- // TODO Auto-generated method stub
-
- }
-
- public PageflowActionBarContributor getPageflowActionContributor() {
- if (pageflowActionContributor == null) {
- pageflowActionContributor = new PageflowActionBarContributor();
- }
- return pageflowActionContributor;
-
- }
-
- public void updateActionBars() {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor instanceof INestedActionContributor)
- ((INestedActionContributor) activeContributor).update();
- // getActionBars().getMenuManager().removeAll();
- // activeContributor.contributeToMenu(getActionBars().getMenuManager());
- getActionBars().updateActionBars();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
deleted file mode 100644
index 5ef1a01c7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
+++ /dev/null
@@ -1,1082 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.EditorPartAction;
-import org.eclipse.gef.ui.actions.SaveAction;
-import org.eclipse.gef.ui.actions.UpdateAction;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.common.actions.IOpenPage;
-import org.eclipse.jst.jsf.facesconfig.edit.provider.FacesConfigItemProviderAdapterFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IntroductionPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OverviewPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.DelegatingZoomManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DelegatingCommandStack;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.EMFCommandStackGEFAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout.PageflowLayoutManager;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-/**
- *
- * @author sfshi
- *
- */
-public class FacesConfigEditor extends FormEditor implements
- IEditingDomainProvider, ISelectionProvider {
-
- /**
- * editing domain that is used to track all changes to the model
- */
- private AdapterFactoryEditingDomain editingDomain;
-
- /**
- * adapter factory used for providing views of the model
- */
- private ComposedAdapterFactory adapterFactory;
-
- /** id of the pageflowPage */
- private int pageflowPageID;
-
- private int managedBeanPageID;
-
- private int componentsPageID;
-
- private int othersPageID;
-
- private int sourcePageId;
-
- private PageflowEditor pageflowPage;
-
- /** The source text editor. */
- private StructuredTextEditor sourcePage;
-
- protected Collection selectionChangedListeners = new ArrayList();
-
- private FacesConfigArtifactEdit facesConfigAtrifactEdit;
-
- public static final String EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor";
-
- protected ISelection editorSelection = StructuredSelection.EMPTY;
-
- private IContentOutlinePage outlinePage;
-
- private IProject currentProject;
-
- public FacesConfigEditor() {
- initializeEMF();
- }
-
- /**
- * This listens for workspace changes. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
- public void resourceChanged(IResourceChangeEvent event) {
- // Only listening to these.
- // if (event.getType() == IResourceDelta.POST_CHANGE)
- {
- IResourceDelta delta = event.getDelta();
- try {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
- protected ResourceSet resourceSet = editingDomain
- .getResourceSet();
-
- protected Collection changedResources = new ArrayList();
-
- protected Collection removedResources = new ArrayList();
-
- public boolean visit(IResourceDelta delta) {
- if (delta.getFlags() != IResourceDelta.MARKERS
- && delta.getResource().getType() == IResource.FILE) {
- if ((delta.getKind() & (IResourceDelta.CHANGED | IResourceDelta.REMOVED)) != 0) {
- Resource resource = resourceSet
- .getResource(URI.createURI(delta
- .getFullPath().toString()),
- false);
- if (resource != null) {
- if ((delta.getKind() & IResourceDelta.REMOVED) != 0) {
- removedResources.add(resource);
- } else {
- changedResources.add(resource);
- }
- }
- }
- }
-
- return true;
- }
-
- public Collection getChangedResources() {
- return changedResources;
- }
-
- public Collection getRemovedResources() {
- return removedResources;
- }
- }
-
- ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if (!visitor.getRemovedResources().isEmpty()) {
- removedResources.addAll(visitor.getRemovedResources());
- if (!isDirty()) {
- getSite().getShell().getDisplay().asyncExec(
- new Runnable() {
- public void run() {
- getSite().getPage().closeEditor(
- FacesConfigEditor.this,
- false);
- FacesConfigEditor.this.dispose();
- }
- });
- }
- }
-
- if (!visitor.getChangedResources().isEmpty()) {
- changedResources.addAll(visitor.getChangedResources());
- }
- } catch (CoreException exception) {
- // log it.
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK, exception
- .getMessage() == null ? "" : exception
- .getMessage(), exception));
- }
- }
- }
- };
-
- /**
- * Resources that have been removed since last activation.
- *
- * @generated
- */
- Collection removedResources = new ArrayList();
-
- /**
- * Resources that have been changed since last activation.
- *
- * @generated
- */
- Collection changedResources = new ArrayList();
-
- /**
- * Resources that have been saved.
- *
- * @generated
- */
- Collection savedResources = new ArrayList();
-
- /**
- * Initializes the EMF support.
- */
- private void initializeEMF() {
- // create an adapter factory that yields item providers
- List factories = new ArrayList();
- factories.add(new ResourceItemProviderAdapterFactory());
- factories.add(new FacesConfigItemProviderAdapterFactory());
- factories.add(new ReflectiveItemProviderAdapterFactory());
- adapterFactory = new ComposedAdapterFactory(factories);
-
- // create the command stack that will notify this editor as commands are
- // executed
- BasicCommandStack commandStack = new BasicCommandStack();
- commandStack
- .addCommandStackListener(new org.eclipse.emf.common.command.CommandStackListener() {
- public void commandStackChanged(final EventObject event) {
- getContainer().getShell().getDisplay().asyncExec(
- new Runnable() {
- public void run() {
- editorDirtyStateChanged();
- getActionBarContributor().updateActionBars();
- }
- });
- }
- });
- // commandStack.addCommandStackListener(this);
- // create the editing domain with a special command stack
- editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
- commandStack, new HashMap());
- }
-
- /*
- * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite,
- * org.eclipse.ui.IEditorInput)
- */
- public void init(IEditorSite site, IEditorInput input)
- throws PartInitException {
- super.init(site, input);
- setPartName(input.getName());
- if (!isValidInput(input)) {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().openEditor(input,
- "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
-
- close(false);
- return;
- }
-
- createActions();
-
- ResourcesPlugin.getWorkspace().addResourceChangeListener(
- resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
- }
-
- /*
- * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
- */
- protected void setInput(IEditorInput input) {
- super.setInput(input);
-
- IFile inputFile = (IFile) input.getAdapter(IFile.class);
- if (inputFile != null) {
- IProject project = inputFile.getProject();
- IPath inputPath = inputFile.getFullPath();
- loadModel(project, inputPath);
- }
- }
-
- /**
- * Loads the configuration model from the given path.
- *
- */
- private void loadModel(IProject project, IPath modelPath) {
-
- IFolder webContentFolder = WebrootUtil.getWebContentFolder(project);
- Assert.isTrue(webContentFolder != null && webContentFolder.exists());
-
- IPath relativePath = modelPath;
- if (webContentFolder.getFullPath().isPrefixOf(modelPath)) {
- relativePath = modelPath.removeFirstSegments(webContentFolder
- .getFullPath().segmentCount());
- }
- facesConfigAtrifactEdit = FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForWrite(project, relativePath
- .toString());
- }
-
- protected void addPages() {
- try {
- IntroductionPage page1 = new IntroductionPage(this);
- addPage(page1, null);
-
- IFormPage overviewPage = new OverviewPage(this);
- addPage(overviewPage, null);
-
- // Page flow
- createAndAddPageflowPage();
-
- // pages
- IFormPage managedBeanPage = new ManagedBeanPage(this);
- managedBeanPageID = addPage(managedBeanPage, null);
- IFormPage componentsPage = new ComponentsPage(this);
- componentsPageID = addPage(componentsPage, null);
- IFormPage othersPage = new OthersPage(this);
- othersPageID = addPage(othersPage, null);
-
- sourcePage = new StructuredTextEditor();
-
- sourcePage.setEditorPart(this);
-
- sourcePageId = addPage(sourcePage, this.getEditorInput());
- setPageText(sourcePageId,
- EditorMessages.FacesConfigEditor_Source_TabName);
- sourcePage.update();
-
- } catch (PartInitException e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, e.getMessage() == null ? "" : e
- .getMessage(), e));
- }
-
- }
-
- /**
- * Creates the pageflow page of the multi-page editor.
- */
- protected void createAndAddPageflowPage() throws PartInitException {
- pageflowPage = new PageflowEditor(this);
- pageflowPageID = addPage(pageflowPage, getEditorInput());
- setPageText(pageflowPageID, "Navigation Rule");
- addPageActionRegistry(pageflowPage);
- pageflowPage.getModelsTransform().setFacesConfig(getFacesConfig());
- pageflowPage.getModelsTransform().setPageflow(
- pageflowPage.getPageflow());
- boolean fornew = pageflowPage.getModelsTransform()
- .updatePageflowModelFromEMF();
- pageflowPage.setGraphicalViewerContents(pageflowPage.getPageflow());
- if (fornew) {
- PageflowLayoutManager.getInstance().layoutPageflow(
- pageflowPage.getPageflow());
- }
- pageflowPage.getModelsTransform().setListenToNotify(true);
- }
-
- public PageflowEditor getPageflowPage() {
- return pageflowPage;
- }
-
- /**
- * get the action's registry of sub pages.
- *
- */
- protected void addPageActionRegistry(IEditorPart page) {
- if (page != null) {
- ActionRegistry pageActionRegisty = (ActionRegistry) page
- .getAdapter(ActionRegistry.class);
- if (pageActionRegisty != null) {
- for (Iterator iter = pageActionRegisty.getActions(); iter
- .hasNext();) {
- getActionRegistry().registerAction((IAction) iter.next());
- }
- }
- }
- }
-
- /** the editor's action registry */
- private ActionRegistry actionRegistry = null;
-
- /**
- * Returns the action registry of this editor.
- *
- * @return - the action registry
- */
- protected ActionRegistry getActionRegistry() {
- if (null == actionRegistry) {
- actionRegistry = new ActionRegistry();
- }
-
- return actionRegistry;
- }
-
- /**
- * Returns the root object of the configuration model.
- *
- * @return the root object
- */
- public FacesConfigType getFacesConfig() {
- FacesConfigType facesConfig = facesConfigAtrifactEdit.getFacesConfig();
- return facesConfig;
- }
-
- /*
- * @see org.eclipse.ui.ISaveablePart#isDirty()
- */
- public boolean isDirty() {
- return ((BasicCommandStack) editingDomain.getCommandStack())
- .isSaveNeeded()
- || super.isDirty();
- }
-
- /**
- * This class listens for command stack changes of the pages contained in
- * this editor and decides if the editor is dirty or not.
- */
- private class MultiPageCommandStackListener implements CommandStackListener {
-
- /** the observed command stacks */
- private List commandStacks = new ArrayList(2);
-
- /** to get the editorpart from command stack */
- private HashMap mapEditorCommandStack = new HashMap();
-
- private boolean saveLocation = false;
-
- /**
- * Adds a <code>CommandStack</code> to observe.
- *
- * @param commandStack
- */
- public void addCommandStack(CommandStack commandStack,
- IEditorPart editor) {
- if (commandStack == null) {
- return;
- }
- if (mapEditorCommandStack.get(commandStack) == editor) {
- return;
- }
- commandStacks.add(commandStack);
- commandStack.addCommandStackListener(this);
- mapEditorCommandStack.put(commandStack, editor);
- }
-
- /**
- * set the dirty status for the models of different editor
- *
- * @param editor -
- * editor, e.g., pageflow or databinding page.
- * @param dirty -
- * true or false
- */
- private void setEditorDirty(IEditorPart editor, boolean dirty) {
-
- }
-
- /** the list of action ids that are to CommandStack actions */
- private List stackActionIDs = new ArrayList();
-
- /**
- * Updates the specified actions.
- *
- * @param actionIds -
- * the list of ids of actions to update
- */
- private void updateActions(List actionIds) {
- for (Iterator ids = actionIds.iterator(); ids.hasNext();) {
- IAction action = getActionRegistry().getAction(ids.next());
- if (null != action && action instanceof UpdateAction) {
- ((UpdateAction) action).update();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStackListener#commandStackChanged(java.util.EventObject)
- */
- public void commandStackChanged(EventObject event) {
- // enable or disable the actions
- updateActions(stackActionIDs);
- if (((CommandStack) event.getSource()).isDirty()) {
- // set the editor's model dirty status
- setEditorDirty((IEditorPart) mapEditorCommandStack
- .get(((CommandStack) event.getSource())), true);
- // at least one command stack is dirty,
- // so the multi page editor is dirty too
- setDirty(true);
- } else {
- // set the editor's model dirty status, if it is from not save
- // location.
- if (!saveLocation) {
- setEditorDirty((IEditorPart) mapEditorCommandStack
- .get(((CommandStack) event.getSource())), true);
- setDirty(true);
- } else {
- setDirty(false);
- }
- }
- }
-
- /** the pageflow page editor's dirty state */
- private boolean isDirty = false;
-
- /**
- * Changes the dirty state.
- *
- * @param dirty -
- * dirty state
- */
- public void setDirty(boolean dirty) {
- if (isDirty != dirty) {
- isDirty = dirty;
- firePropertyChange(IEditorPart.PROP_DIRTY);
- }
- }
-
- /**
- * Disposed the listener
- */
- public void dispose() {
- for (Iterator stacks = commandStacks.iterator(); stacks.hasNext();) {
- ((CommandStack) stacks.next()).removeCommandStackListener(this);
- }
- commandStacks.clear();
- }
-
- /**
- * Marks every observed command stack beeing saved. This method should
- * be called whenever the editor/model was saved.
- */
- public void markSaveLocations() {
- saveLocation = true;
- for (Iterator stacks = commandStacks.iterator(); stacks.hasNext();) {
- CommandStack stack = (CommandStack) stacks.next();
- stack.markSaveLocation();
- }
- saveLocation = false;
- }
-
- /**
- * Flushes every observed command stack and resets the save location to
- * zero.
- */
- public void flush() {
- for (Iterator stacks = commandStacks.iterator(); stacks.hasNext();) {
- CommandStack stack = (CommandStack) stacks.next();
- stack.flush();
- }
- }
- }
-
- /** the <code>CommandStackListener</code> */
- private MultiPageCommandStackListener multiPageCommandStackListener = null;
-
- /**
- * Returns the global command stack listener.
- *
- * @return the <code>CommandStackListener</code>
- */
- protected MultiPageCommandStackListener getMultiPageCommandStackListener() {
- if (null == multiPageCommandStackListener) {
- multiPageCommandStackListener = new MultiPageCommandStackListener();
- }
- return multiPageCommandStackListener;
- }
-
- /*
- * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void doSave(IProgressMonitor monitor) {
- // do the work within an operation because this is a long running
- // activity that modifies the workbench
- WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
- public void execute(IProgressMonitor monitor) {
- try {
- // modelResource.save(Collections.EMPTY_MAP);
- facesConfigAtrifactEdit.getDeploymentDescriptorResource()
- .save(Collections.EMPTY_MAP);
- IFile file = ((IFileEditorInput) getEditorInput())
- .getFile();
- pageflowPage.doSave(file, monitor);
- sourcePage.doSave(monitor);
- getMultiPageCommandStackListener().markSaveLocations();
- } catch (Exception e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK,
- e.getMessage() == null ? "" : e
- .getMessage(), e));
- }
- }
- };
- try {
- // commit all pending changes in form pages
- for (Iterator iter = pages.iterator(); iter.hasNext();) {
- Object obj = iter.next();
- if (obj instanceof FormPage) {
- ((FormPage) obj).doSave(monitor);
- }
- // else if (obj instanceof PageflowEditor) {
- // ((PageflowEditor) obj).doSave(monitor);
- // }
-
- }
- operation.run(null);// .run(true, false,
- // operation;
- // runs the operation, and shows progress
- // new ProgressMonitorDialog();
-
- // refresh the necessary state
- ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-
- editorDirtyStateChanged();
- } catch (Exception e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, e.getMessage(), e));
- }
- }
-
- public void doSaveAs() {
- SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
- saveAsDialog.open();
- IPath path = saveAsDialog.getResult();
- if (path != null) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (file != null) {
- doSaveAs(URI.createPlatformResourceURI(file.getFullPath()
- .toString()), new FileEditorInput(file));
- }
- }
- }
-
- protected void doSaveAs(URI uri, IEditorInput editorInput) {
- ((Resource) editingDomain.getResourceSet().getResources().get(0))
- .setURI(uri);
- setInputWithNotify(editorInput);
- setPartName(editorInput.getName());
- IProgressMonitor progressMonitor = getActionBars()
- .getStatusLineManager() != null ? getActionBars()
- .getStatusLineManager().getProgressMonitor()
- : new NullProgressMonitor();
- doSave(progressMonitor);
- }
-
- public boolean isSaveAsAllowed() {
- // TODO Auto-generated method stub
- return true;
- }
-
- /**
- * Returns the <code>TabbedPropertySheetPage</code> for this editor.
- *
- * @return - the <code>TabbedPropertySheetPage</code>
- */
- protected IPropertySheetPage getPropertySheetPage() {
- return new TabbedPropertySheetPage(
- new ITabbedPropertySheetPageContributor() {
-
- public String getContributorId() {
- return EDITOR_ID;
- }
- });
- }
-
- /** the delegating ZoomManager */
- private DelegatingZoomManager delegatingZoomManager = null;
-
- /**
- * check whether the input is related with IFile.
- *
- * @param input
- * @return
- */
- private boolean isValidInput(IEditorInput input) {
- if (input != null) {
- IFile file = (IFile) input.getAdapter(IResource.class);
- if (file != null) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns the <code>DelegatingZoomManager</code> for this editor.
- *
- * @return - the <code>DelegatingZoomManager</code>
- */
- protected DelegatingZoomManager getDelegatingZoomManager() {
- if (!isValidInput(getEditorInput())) {
- return null;
- }
- if (null == delegatingZoomManager) {
- delegatingZoomManager = new DelegatingZoomManager();
- delegatingZoomManager
- .setCurrentZoomManager((ZoomManager) pageflowPage
- .getAdapter(ZoomManager.class));
- }
- return delegatingZoomManager;
- }
-
- /** the delegating CommandStack */
- private DelegatingCommandStack delegatingCommandStack = null;
-
- /**
- * Returns the <code>CommandStack</code> for this editor.
- *
- * @return - the <code>CommandStack</code>
- */
- public DelegatingCommandStack getDelegatingCommandStack() {
- if (null == delegatingCommandStack) {
- delegatingCommandStack = new DelegatingCommandStack();
- }
- return delegatingCommandStack;
- }
-
- /*
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IEditingDomainProvider.class) {
- return new IEditingDomainProvider() {
- public EditingDomain getEditingDomain() {
- return editingDomain;
- }
- };
- }
- if (adapter == EditingDomain.class) {
- return editingDomain;
- }
- if (adapter == AdapterFactory.class) {
- return adapterFactory;
- }
- if (adapter == IEditorPart.class) {
- return getActiveEditor();
- }
-
- if (adapter == CommandStack.class) {
- return getDelegatingCommandStack();
- }
- if (adapter == ZoomManager.class) {
- return getDelegatingZoomManager();
- }
-
- if (adapter == ActionRegistry.class) {
- return getActionRegistry();
- }
- if (adapter == IGotoMarker.class) {
- return new IGotoMarker() {
- public void gotoMarker(IMarker marker) {
- FacesConfigEditor.this.gotoMarker(marker);
- }
- };
- }
- if (adapter == StructuredTextEditor.class) {
- return sourcePage;
- }
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
-
- if (adapter == IProject.class) {
- return getProject();
- }
-
- if (adapter == CTabFolder.class) {
- return getContainer();
- }
-
- if (adapter == IOpenPage.class) {
- return new IOpenPage() {
-
- public void setActiveEditorPage(String pageID) {
- FacesConfigEditor.this.setActiveEditorPage(pageID);
-
- }
- };
- }
-
- return super.getAdapter(adapter);
- }
-
- private EMFCommandStackGEFAdapter sourceCommandStack;
-
- /**
- * get or create the source page's GEF command stack based on its EMF
- * command stack.
- *
- * @return
- */
- private CommandStack getSourcePageCommandStack() {
- if (sourceCommandStack == null) {
- sourceCommandStack = new EMFCommandStackGEFAdapter(
- (BasicCommandStack) sourcePage.getModel().getUndoManager()
- .getCommandStack());
- }
- return sourceCommandStack;
- }
-
- /** the list of action ids that are to CommandStack actions */
- // private List stackActionIDs = new ArrayList();
- /** the list of action ids that are editor actions */
- private List editorActionIDs = new ArrayList();
-
- /**
- * Adds an editor action to this editor.
- * <p>
- * Editor actions are actions that depend and work on the editor.
- *
- * @param action -
- * the editor action
- */
- protected void addEditorAction(EditorPartAction action) {
- getActionRegistry().registerAction(action);
- editorActionIDs.add(action.getId());
- }
-
- /**
- * Creates different kinds of actions and registers them to the
- * ActionRegistry.
- */
- protected void createActions() {
- // register save action
- addEditorAction(new SaveAction(this));
- }
-
- /**
- * Indicates that the current page has changed.
- * <p>
- * We update the DelegatingCommandStack, OutlineViewer and other things
- * here. //
- */
- protected void currentPageChanged() {
- IEditorPart activeEditor = getActiveEditor();
- if (activeEditor == null) {
- return;
- }
-
- // update command stack
- CommandStack cmdStack = null;
-
- if (activeEditor == pageflowPage) {
- cmdStack = (CommandStack) activeEditor
- .getAdapter(CommandStack.class);
- } else if (activeEditor == sourcePage)// other page will delegate the
- // GEF command stack to source
- // page's.
- {
- cmdStack = this.getSourcePageCommandStack();
- }
-
- // Add command stacks
- getMultiPageCommandStackListener().addCommandStack(cmdStack,
- activeEditor);
- getDelegatingCommandStack().setCurrentCommandStack(cmdStack);
-
- // enable or disable the actions
- // updateActions(stackActionIDs);
-
- // update zoom actions
- ZoomManager zoomManager = null;
- zoomManager = (ZoomManager) activeEditor.getAdapter(ZoomManager.class);
-
- if (zoomManager != null) {
- getDelegatingZoomManager().setCurrentZoomManager(zoomManager);
- }
-
- IEditorActionBarContributor contributor = getEditorSite()
- .getActionBarContributor();
- if (contributor != null
- && contributor instanceof FacesConfigActionBarContributor) {
- ((FacesConfigActionBarContributor) contributor)
- .setActivePage(activeEditor);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see MultiPageEditorPart#pageChange(int)
- */
- protected void pageChange(int newPageIndex) {
- super.pageChange(newPageIndex);
- // getActionBarContributor().setActivePage(getActiveEditor());
- // refresh content depending on current page
- currentPageChanged();
- }
-
- public void dispose() {
- if (facesConfigAtrifactEdit != null)
- facesConfigAtrifactEdit.dispose();
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(
- resourceChangeListener);
-
- adapterFactory.dispose();
-
- if (this.outlinePage != null) {
- outlinePage.dispose();
- }
-
- super.dispose();
- }
-
- /**
- * get the project of the faces config file that the editor is working on.
- *
- * @return
- */
- public IProject getProject() {
- if (currentProject == null) {
- if (facesConfigAtrifactEdit != null) {
- IFile file = facesConfigAtrifactEdit.getFile();
- if (file != null)
- currentProject = file.getProject();
- }
- }
- return currentProject;
- }
-
- public EditingDomain getEditingDomain() {
- return editingDomain;
- }
-
- /**
- * Returns the <code>IContentOutlinePage</code> for this editor.
- *
- * @return - the <code>IContentOutlinePage</code>
- */
- protected IContentOutlinePage getOutlinePage() {
- if (null == outlinePage) {
- outlinePage = new MultiPageEditorOutlinePage();
- }
- return outlinePage;
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
-
- }
-
- public ISelection getSelection() {
- return editorSelection;
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- public void setSelection(ISelection selection) {
- editorSelection = selection;
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener
- .selectionChanged(new SelectionChangedEvent(this, selection));
- }
- }
-
- public void gotoMarker(IMarker marker) {
- setActivePage(sourcePageId);
- IDE.gotoMarker(this.sourcePage, marker);
- }
-
- public FacesConfigActionBarContributor getActionBarContributor() {
- return (FacesConfigActionBarContributor) getEditorSite()
- .getActionBarContributor();
- }
-
- public IActionBars getActionBars() {
- return getActionBarContributor().getActionBars();
- }
-
- /**
- * Shows a dialog that asks if conflicting changes should be discarded.
- *
- * @generated
- */
- protected boolean handleDirtyConflict() {
- return MessageDialog
- .openQuestion(
- getSite().getShell(),
- "File Conflict",
- " There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?");
- }
-
- /**
- * Handles what to do with changed resources on activation.
- *
- * @generated
- */
- protected void handleChangedResources() {
- if (!changedResources.isEmpty()
- && (!isDirty() || handleDirtyConflict())) {
- editingDomain.getCommandStack().flush();
-
- for (Iterator i = changedResources.iterator(); i.hasNext();) {
- Resource resource = (Resource) i.next();
- if (resource.isLoaded()) {
- resource.unload();
- try {
- resource.load(Collections.EMPTY_MAP);
- } catch (IOException exception) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK, exception
- .getMessage() == null ? "" : exception
- .getMessage(), exception));
- }
- }
- }
- }
- }
-
- public void setActiveEditorPage(String pageID) {
- if (pageID.equals(PageflowEditor.PAGE_ID)) {
- setActivePage(pageflowPageID);
- } else if (pageID.equals(ManagedBeanPage.PAGE_ID)) {
- setActivePage(managedBeanPageID);
- } else if (pageID.equals(ComponentsPage.PAGE_ID)) {
- setActivePage(componentsPageID);
- } else if (pageID.equals(OthersPage.PAGE_ID)) {
- setActivePage(othersPageID);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java
deleted file mode 100644
index bb72553da..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-/**
- * @author jchoi
- * @version
- */
-public interface IFacesConfigConstants {
-
- public static final String FACES_CONFIG = "faces-config";
-
- public static final String MANAGED_PROPERTY = "managed-property";
-
- public static final String VALUE = "value";
-
- public static final String NULL_VALUE = "null-value";
-
- public static final String MAP_ENTRIES = "map-entries";
-
- public static final String MAP_ENTRY = "map-entry";
-
- public static final String LIST_ENTRIES = "list-entries";
-
- public static final String NAVIGATION_RULE = "navigation-rule";
-
- public static final String COMPONENT_SUPER_CLASS = "javax.faces.component.UIComponent";
-
- public static final String RENDER_KIT_SUPER_CLASS = "javax.faces.render.RenderKit";
-
- public static final String CONVERTER_INTERFACE = "javax.faces.convert.Converter";
-
- public static final String VALIDATOR_INTERFACE = "javax.faces.validator.Validator";
-
- public static final String RENDERER_SUPER_CLASS = "javax.faces.render.Renderer";
-
- public static final String ACTION_LISTENER_INTERFACE = "javax.faces.event.ActionListener";
-
- public static final String NAVIGATION_HANDLE_SUPER_CLASS = "javax.faces.application.NavigationHandler";
-
- public static final String PROPERTY_RESOLVER_SUPER_CLASS = "javax.faces.el.PropertyResolver";
-
- public static final String STATE_MANAGER_SUPER_CLASS = "javax.faces.application.StateManager";
-
- public static final String VARIABLE_RESOLVER_SUPER_CLASS = "javax.faces.el.VariableResolver";
-
- public static final String VIEW_HANDLER_SUPER_CLASS = "javax.faces.application.ViewHandler";
-
- public static final String APPLICATION_FACTORY_SUPER_CLASS = "javax.faces.application.ApplicationFactory";
-
- public static final String FACES_CONTEXT_FACTORY_SUPER_CLASS = "javax.faces.context.FacesContextFactory";
-
- public static final String LIFECYCLE_FACTORY_SUPER_CLASS = "javax.faces.lifecycle.LifecycleFactory";
-
- public static final String RENDER_KIT_FACTORY_SUPER_CLASS = "javax.faces.render.RenderKitFactory";
-
- public static final String PHASE_LISTENER_INTERFACE = "javax.faces.event.PhaseListener";
-
- public static final String MANAGED_BEAN_SCOPE_APPLICATION = "application";
-
- public static final String MANAGED_BEAN_SCOPE_SESSION = "session";
-
- public static final String MANAGED_BEAN_SCOPE_REQUEST = "request";
-
- public static final String MANAGED_BEAN_SCOPE_NONE = "none";
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java
deleted file mode 100644
index 132d2460a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-/**
- * The nested action contributor should be able to update its actions as
- * required.
- */
-public interface INestedActionContributor {
- void update();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
deleted file mode 100644
index f9c97b625..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
+++ /dev/null
@@ -1,706 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.SubActionBars;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.IPage;
-import org.eclipse.ui.part.IPageBookViewPage;
-import org.eclipse.ui.part.IPageSite;
-import org.eclipse.ui.part.MessagePage;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * @author Xiao-guang Zhang
- *
- * The outline page class for mulitPage Editorpart.
- */
-public class MultiPageEditorOutlinePage extends Page implements
- IContentOutlinePage, SelectionListener {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(MultiPageEditorOutlinePage.class);
-
- /**
- * Selection change listeners.
- */
- private ListenerList selectionChangedListeners = new ListenerList(1);
-
- /** the pagebook */
- private PageBook pageBook = null;
-
- /**
- * Selection change listener to listen for page selection changes
- */
- private ISelectionChangedListener selectionChangedListener = new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- pageSelectionChanged(event);
- }
- };
-
- /**
- * A data structure used to store the information about a single page within
- * a MultiPageEditorOutlinePage
- */
- protected static class PageRec {
-
- /**
- * The part including editorpart, or Control
- */
- public IWorkbenchPart part;
-
- /**
- * The page.
- */
- public IPage page;
-
- /**
- * The page's action bars
- */
- public SubActionBars subActionBars;
-
- /**
- * Creates a new page record initialized to the given part and page.
- *
- * @param part
- * @param page
- */
- public PageRec(IWorkbenchPart part, IPage page) {
- this.part = part;
- this.page = page;
- }
-
- /**
- * Disposes of this page record by <code>null</code>ing its fields.
- */
- public void dispose() {
- part = null;
- page = null;
- }
- }
-
- /**
- * The page record for the default page.
- */
- private PageRec defaultPageRec;
-
- /**
- * Map from parts to part records (key type: <code>IWorkbenchPart</code>;
- * value type: <code>PartRec</code>).
- */
- private Map mapPartToRec = new HashMap();
-
- /**
- * Map from pages to view sites Note that view sites were not added to page
- * recs to avoid breaking binary compatibility with previous builds
- */
- private Map mapPageToSite = new HashMap();
-
- /**
- * The page rec which provided the current page or <code>null</code>
- */
- private PageRec activeRec;
-
- /**
- * the container composite control of MutliPageEditorPart
- */
- private CTabFolder tabFolder;
-
- /**
- * Creates a new MultiPageEditorOutlinePage instance.
- *
- *
- */
- public MultiPageEditorOutlinePage() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.Page#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- // pagebook
- pageBook = new PageBook(parent, SWT.NONE);
-
- // Create the default page rec.
- IPage defaultPage = createDefaultPage(pageBook);
- defaultPageRec = new PageRec(null, defaultPage);
- preparePage(defaultPageRec);
-
- // Show the default page
- showPageRec(defaultPageRec);
-
- // get the tab control and add the page selection listener.
- if (getContainerForMultiPageEditorPart() != null) {
- getContainerForMultiPageEditorPart().addSelectionListener(this);
- }
-
- // show the activate part page.
- showBootstrapPart();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Page#dispose()
- */
- public void dispose() {
- // Deref all of the pages.
- activeRec = null;
- if (defaultPageRec != null) {
- // check for null since the default page may not have
- // been created (ex. perspective never visible)
- defaultPageRec.page.dispose();
- defaultPageRec = null;
- }
- Map clone = (Map) ((HashMap) mapPartToRec).clone();
- Iterator iterator = clone.values().iterator();
- while (iterator.hasNext()) {
- PageRec rec = (PageRec) iterator.next();
- removePage(rec);
- }
-
- // important: always call super implementation of dispose
- super.dispose();
- }
-
- /**
- * Creates and returns the default page for this view.
- *
- * @param book -
- * the pagebook control
- * @return - the default page
- */
- protected IPage createDefaultPage(PageBook book) {
- // Message to show on the default page
- String defaultText = EditorMessages.MultiPageEditorOutlinePage_noOutline;
-
- MessagePage page = new MessagePage();
- initPage(page);
- page.createControl(book);
- page.setMessage(defaultText);
- return page;
- }
-
- /**
- * Prepares the page in the given page rec for use in this view.
- *
- * @param rec -
- * the page rec
- */
- private void preparePage(PageRec rec) {
- IPageSite site = null;
-
- if (!doesPageExist(rec.page)) {
- if (rec.page instanceof IPageBookViewPage) {
- site = ((IPageBookViewPage) rec.page).getSite();
- }
- if (site == null) {
- // We will create a site for our use
- site = new SubPageSite(getSite());
- }
- mapPageToSite.put(rec.page, site);
-
- rec.subActionBars = (SubActionBars) site.getActionBars();
- // rec.subActionBars.addPropertyChangeListener(actionBarPropListener);
- // for backward compability with IPage
- rec.page.setActionBars(rec.subActionBars);
-
- } else {
- site = (IPageSite) mapPageToSite.get(rec.page);
- rec.subActionBars = (SubActionBars) site.getActionBars();
- }
- }
-
- /**
- * Returns the currently visible page for this view or <code>null</code>
- * if no page is currently visible.
- *
- * @return the currently visible page
- */
- public IPage getCurrentPage() {
- if (activeRec == null)
- return null;
- return activeRec.page;
- }
-
- /**
- * Returns the view site for the given page of this view.
- *
- * @param page
- * the page
- * @return the corresponding site, or <code>null</code> if not found
- */
- protected SubPageSite getPageSite(IPage page) {
- return (SubPageSite) mapPageToSite.get(page);
- }
-
- /**
- * Shows page contained in the given page record in this view. The page
- * record must be one from this pagebook view.
- * <p>
- * The <code>PageBookView</code> implementation of this method asks the
- * pagebook control to show the given page's control, and records that the
- * given page is now current. Subclasses may extend.
- * </p>
- *
- * @param pageRec
- * the page record containing the page to show
- */
- protected void showPageRec(PageRec pageRec) {
- IPageSite pageSite = getPageSite(pageRec.page);
- ISelectionProvider provider = pageSite.getSelectionProvider();
- if (provider == null && (pageRec.page instanceof IContentOutlinePage)) {
- // This means that the page did not set a provider during its
- // initialization
- // so for backward compatibility we will set the page itself as the
- // provider.
- pageSite.setSelectionProvider((IContentOutlinePage) pageRec.page);
- }
-
- // If already showing do nothing
- if (activeRec == pageRec) {
- return;
- }
- // If the page is the same, just set activeRec to pageRec
- if (activeRec != null && pageRec != null
- && activeRec.page == pageRec.page) {
- activeRec = pageRec;
- return;
- }
-
- // Hide old page.
- if (activeRec != null) {
- activeRec.subActionBars.deactivate();
- // remove our selection listener
- provider = ((SubPageSite) mapPageToSite.get(activeRec.page))
- .getSelectionProvider();
- if (provider != null) {
- provider
- .removeSelectionChangedListener(selectionChangedListener);
- }
- }
- // Show new page.
- activeRec = pageRec;
- Control pageControl = activeRec.page.getControl();
- if (pageControl != null && !pageControl.isDisposed()) {
- // Verify that the page control is not disposed
- // If we are closing, it may have already been disposed
- pageBook.showPage(pageControl);
- activeRec.subActionBars.activate();
- refreshGlobalActionHandlers();
- // add our selection listener
- provider = ((SubPageSite) mapPageToSite.get(activeRec.page))
- .getSelectionProvider();
- if (provider != null) {
- provider.addSelectionChangedListener(selectionChangedListener);
- }
- // Update action bars.
- getSite().getActionBars().updateActionBars();
- }
- }
-
- /**
- * Refreshes the global actions for the active page.
- */
- private void refreshGlobalActionHandlers() {
- // Clear old actions.
- IActionBars bars = getSite().getActionBars();
- bars.clearGlobalActionHandlers();
-
- // Set new actions.
- Map newActionHandlers = activeRec.subActionBars
- .getGlobalActionHandlers();
- if (newActionHandlers != null) {
- Set keys = newActionHandlers.entrySet();
- Iterator iter = keys.iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- bars.setGlobalActionHandler((String) entry.getKey(),
- (IAction) entry.getValue());
- }
- }
- }
-
- /**
- * Creates a page for a given part. Adds it to the pagebook but does not
- * show it.
- *
- * @param part
- * The part we are making a page for.
- * @return IWorkbenchPart
- */
- private PageRec createPage(IWorkbenchPart part) {
- PageRec rec = doCreatePage(part);
- if (rec != null) {
- mapPartToRec.put(part, rec);
- preparePage(rec);
- }
- return rec;
- }
-
- /*
- * (non-Javadoc) Method declared on PageBookView.
- */
- protected PageRec doCreatePage(IWorkbenchPart part) {
- // Try to get an outline page.
- Object obj = part.getAdapter(IContentOutlinePage.class);
- if (obj instanceof IContentOutlinePage) {
- IContentOutlinePage page = (IContentOutlinePage) obj;
- if (page instanceof IPageBookViewPage) {
- initPage((IPageBookViewPage) page);
- }
- page.createControl(getPageBook());
- return new PageRec(part, page);
- }
- // There is no content outline
- return null;
- }
-
- /**
- * Returns the pagebook control for this view.
- *
- * @return the pagebook control, or <code>null</code> if not initialized
- */
- protected PageBook getPageBook() {
- return pageBook;
- }
-
- /**
- * Returns the page record for the given part.
- *
- * @param part
- * the part
- * @return the corresponding page record, or <code>null</code> if not
- * found
- */
- protected PageRec getPageRec(Object part) {
- return (PageRec) mapPartToRec.get(part);
- }
-
- /**
- * Initializes the given page with a page site.
- * <p>
- * Subclasses should call this method after the page is created but before
- * creating its controls.
- * </p>
- * <p>
- * Subclasses may override
- * </p>
- *
- * @param page
- * The page to initialize
- */
- protected void initPage(IPageBookViewPage page) {
- try {
- page.init(new SubPageSite(getSite()));
- } catch (PartInitException e) {
- log.error(e.getMessage());
- }
- }
-
- /**
- * Shows a page for the active workbench part.
- */
- private void showBootstrapPart() {
- IWorkbenchPart part = getBootstrapPart();
- if (part != null) {
- partActivated(part);
- }
- }
-
- /**
- * Returns the active, important workbench part for this view.
- *
- * @return the active important part, or <code>null</code> if none
- */
- private IWorkbenchPart getBootstrapPart() {
- IWorkbenchPage page = getSite().getPage();
- if (page != null
- && page.getActiveEditor() instanceof MultiPageEditorPart) {
- // get active editor of mutli-page editor.
- return (IWorkbenchPart) page.getActiveEditor().getAdapter(
- IEditorPart.class);
- } else {
- return null;
- }
- }
-
- /**
- * This method shows the page when the given part is activated. Subclasses
- * may extend.
- */
- private void partActivated(IWorkbenchPart part) {
- // Is this an important part? If not just return.
- if (!isImportant(part)) {
- return;
- }
-
- // Create a page for the part.
- PageRec rec = getPageRec(part);
- if (rec == null) {
- rec = createPage(part);
- }
-
- // Show the page.
- if (rec != null) {
- showPageRec(rec);
- } else {
- showPageRec(defaultPageRec);
- }
- }
-
- /**
- * Returns true if the page has already been created.
- *
- * @param page
- * the page to test
- * @return true if this page has already been created.
- */
- private boolean doesPageExist(IPage page) {
- return mapPageToSite.containsKey(page);
- }
-
- /**
- * Returns whether the given part should be added to this view.
- *
- * @param part
- * the input part
- * @return <code>true</code> if the part is relevant, and
- * <code>false</code> otherwise
- */
- protected boolean isImportant(IWorkbenchPart part) {
- // We only care about editors
- return (part instanceof IEditorPart);
- }
-
- /**
- * get the composite control (Container) of source MultiPageEditorPart
- *
- * @return - the composite control (Container)
- */
- private CTabFolder getContainerForMultiPageEditorPart() {
- if (null == tabFolder) {
- tabFolder = ((CTabFolder) (getSite().getPage().getActiveEditor()
- .getAdapter(CTabFolder.class)));
- }
- return tabFolder;
- }
-
- /**
- * Removes a page record. If it is the last reference to the page dispose of
- * it - otherwise just decrement the reference count.
- *
- * @param rec
- */
- private void removePage(PageRec rec) {
- mapPartToRec.remove(rec.part);
- IPageSite site = (IPageSite) mapPageToSite.remove(rec.page);
-
- if (rec.subActionBars != null) {
- rec.subActionBars.dispose();
- }
-
- Control control = rec.page.getControl();
- if (control != null && !control.isDisposed()) {
- // Dispose the page's control so pages don't have to do this in
- // their
- // dispose method.
- // The page's control is a child of this view's control so if this
- // view
- // is closed, the page's control will already be disposed.
- control.dispose();
- }
-
- if (site instanceof SubPageSite) {
- ((SubPageSite) site).dispose();
- }
-
- // free the page
- doDestroyPage(rec.part, rec);
- }
-
- /**
- * Destroys a page in the pagebook for a particular part.
- *
- * @param part
- * the input part
- * @param pageRecord
- * a page record for the part
- */
- protected void doDestroyPage(IWorkbenchPart part, PageRec rec) {
- IContentOutlinePage page = (IContentOutlinePage) rec.page;
- page.dispose();
- rec.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.Page#getControl()
- */
- public Control getControl() {
- return pageBook;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.Page#setFocus()
- */
- public void setFocus() {
- if (getControl() != null) {
- getControl().setFocus();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- // get the selection provider from the current page
- IPage currentPage = getCurrentPage();
- // during workbench startup we may be in a state when
- // there is no current page
- if (currentPage == null) {
- return StructuredSelection.EMPTY;
- }
- IPageSite site = getPageSite(currentPage);
- if (site == null) {
- return StructuredSelection.EMPTY;
- }
- ISelectionProvider selProvider = site.getSelectionProvider();
- if (selProvider != null) {
- return selProvider.getSelection();
- }
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // get the selection provider from the current page
- IPage currentPage = getCurrentPage();
- // during workbench startup we may be in a state when
- // there is no current page
- if (currentPage == null) {
- return;
- }
- IPageSite site = getPageSite(currentPage);
- if (site == null) {
- return;
- }
- ISelectionProvider selProvider = site.getSelectionProvider();
- // and set its selection
- if (selProvider != null) {
- selProvider.setSelection(selection);
- }
- }
-
- /**
- * The selection has changed. Process the event.
- *
- * @param event
- */
- public void pageSelectionChanged(final SelectionChangedEvent event) {
- // pass on the notification to listeners
- Object[] listeners = selectionChangedListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
- SafeRunner.run(new SafeRunnable() {
- public void run() {
- l.selectionChanged(event);
- }
- });
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see SelectionListener#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- EditorPart part = (EditorPart) ((CTabItem) e.item).getData();
-
- if (part != null) {
- partActivated(part);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java
deleted file mode 100644
index 038bcbec7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * The action contributor for form based page.
- *
- * @author hmeng
- *
- */
-public class MyEditingDomainActionContributor extends
- EditingDomainActionBarContributor implements INestedActionContributor {
- public void setActiveEditor(IEditorPart part) {
- super.setActiveEditor(part);
- if (getActiveEditor() != null) {
- deactivate();
- }
- IActionBars actionBars = getActionBars();
- actionBars.clearGlobalActionHandlers();
-
- actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(),
- deleteAction);
- actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(),
- undoAction);
- actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(),
- redoAction);
- // actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(),
- // cutAction);
- // actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(),
- // copyAction);
- // actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(),
- // pasteAction);
- if (part instanceof IEditingDomainProvider) {
- activate();
- }
- }
-
- public void update() {
- if (getActiveEditor() instanceof IEditingDomainProvider) {
- super.update();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java
deleted file mode 100644
index dc280409c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.SubActionBars;
-import org.eclipse.ui.part.IPageSite;
-
-/**
- *
- * This implementation of <code>IPageSite</code> provides a site for a sub
- * page within a <code>Page</code>. Most methods are forwarded to the parent
- * page's site.
- *
- * @author Xiao-guang Zhang
- */
-public class SubPageSite implements IPageSite {
-
- /**
- * The "parent" Page site
- */
- private IPageSite parentSite;
-
- /**
- * A selection provider set by the page. Value is <code>null</code> until
- * set.
- */
- private ISelectionProvider selectionProvider;
-
- /**
- * The action bars for this site
- */
- private SubActionBars subActionBars;
-
- /**
- * The list of menu extender for each registered menu.
- */
-// private ArrayList menuExtenders;
-
- /**
- * Creates a new sub page site of the given parent page site.
- *
- * @param parentSite
- * the parent view site
- */
- public SubPageSite(IPageSite parentSite) {
- Assert.isNotNull(parentSite);
- this.parentSite = parentSite;
- subActionBars = new SubActionBars(this.parentSite.getActionBars());
- }
-
- /**
- * Disposes of the menu extender contributions.
- */
- protected void dispose() {
- // if (menuExtenders != null) {
- // for (int i = 0; i < menuExtenders.size(); i++) {
- // ((PopupMenuExtender) menuExtenders.get(i)).dispose();
- // }
- // menuExtenders = null;
- // }
- subActionBars.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.IPageSite#registerContextMenu(java.lang.String,
- * org.eclipse.jface.action.MenuManager,
- * org.eclipse.jface.viewers.ISelectionProvider)
- */
- public void registerContextMenu(String menuId, MenuManager menuManager,
- ISelectionProvider selectionProvider) {
-
- parentSite.registerContextMenu(menuId, menuManager, selectionProvider);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.IPageSite#getActionBars()
- */
- public IActionBars getActionBars() {
- return subActionBars;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getPage()
- */
- public IWorkbenchPage getPage() {
- return parentSite.getPage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getSelectionProvider()
- */
- public ISelectionProvider getSelectionProvider() {
- return selectionProvider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getShell()
- */
- public Shell getShell() {
- return parentSite.getShell();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getWorkbenchWindow()
- */
- public IWorkbenchWindow getWorkbenchWindow() {
- return parentSite.getWorkbenchWindow();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
- */
- public void setSelectionProvider(ISelectionProvider provider) {
- selectionProvider = provider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return parentSite.getAdapter(adapter);
- }
-
- public Object getService(Class api) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean hasService(Class api) {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
deleted file mode 100644
index 761fc68b7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * The dialog is for adding and editing attribute.
- *
- * @author sfshi
- *
- */
-public class AddEditAttributeDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private StringDialogField attributeNameField;
-
- private ClassButtonDialogField attributeClassField;
-
- private StringDialogField defaultValueField;
-
- private StringDialogField suggestedValueField;
-
- private IProject project;
-
- private String attributeName;
-
- private String attributeClass;
-
- private String defaultValue;
-
- private String suggestedValue;
-
- private boolean isNew;
-
- public AddEditAttributeDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param attributeName
- * @param attributeClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditAttributeDialog(Shell parentShell, String attributeName,
- String attributeClass, String defaultValue, String suggestedValue) {
- super(parentShell);
- this.attributeName = attributeName;
- this.attributeClass = attributeClass;
- this.defaultValue = defaultValue;
- this.suggestedValue = suggestedValue;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.AttributeSection_Dialog_Title_Add);
- else
- newShell
- .setText(EditorMessages.AttributeSection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem
- .setText(EditorMessages.AttributeSection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- attributeNameField = new StringDialogField();
-// attributeNameField.setRequired(true);
- attributeNameField
- .setLabelText(EditorMessages.AttributeSection_Dialog_AttributeName);
-
- attributeClassField = new ClassButtonDialogField(getProject());
-// attributeClassField.setRequired(true);
- attributeClassField
- .setLabelText(EditorMessages.AttributeSection_Dialog_AttributeClass);//$NON-NLS-1$
-
- attributeClassField.setAutoOpenResource(false);
-
- defaultValueField = new StringDialogField();
- defaultValueField
- .setLabelText(EditorMessages.AttributeSection_Dialog_DefaultValue);
-
- suggestedValueField = new StringDialogField();
- suggestedValueField
- .setLabelText(EditorMessages.AttributeSection_Dialog_SuggestedValue);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- attributeNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- attributeClassField.doFillIntoGrid(null, composite, numberOfColumns);
-
- defaultValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- suggestedValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(attributeClassField.getTextControl(
- null, composite));
-
- // set the initial value for these fields.
- attributeNameField.setText(attributeName);
- attributeClassField.setText(attributeClass);
- defaultValueField.setText(defaultValue);
- suggestedValueField.setText(suggestedValue);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- public IProject getProject() {
- return project;
- }
-
- /**
- *
- */
- protected void okPressed() {
- attributeName = attributeNameField.getText();
- attributeClass = attributeClassField.getText();
- defaultValue = defaultValueField.getText();
- suggestedValue = suggestedValueField.getText();
-
- super.okPressed();
- }
-
- public String getAttributeClass() {
- return attributeClass;
- }
-
- public void setAttributeClass(String attributeClass) {
- this.attributeClass = attributeClass;
- }
-
- public String getAttributeName() {
- return attributeName;
- }
-
- public void setAttributeName(String attributeName) {
- this.attributeName = attributeName;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getSuggestedValue() {
- return suggestedValue;
- }
-
- public void setSuggestedValue(String suggestedValue) {
- this.suggestedValue = suggestedValue;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
deleted file mode 100644
index 41e5f37b3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * The dialog is for adding and editing a facet.
- *
- * @author sfshi
- *
- */
-public class AddEditFacetDialog extends Dialog {
-
- private StringDialogField facetNameField;
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private boolean isNew;
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private String facetName;
-
- private String displayName;
-
- private String description;
-
- /**
- * Constructor of this dialog, could be used for adding and editing, usually
- * it is used for adding;
- *
- * @param parentShell
- * @param isNew
- * whether this dialog is used for create a new facet or not;
- */
- public AddEditFacetDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- * Usually this contructor is used for editing a facet, passing the original
- * values of facet here.
- *
- * @param parentShell
- * @param facetName
- * the original text value of facet-name element;
- * @param displayName
- * the original text value of display-name element;
- * @param description
- * the original text value of description element;
- */
- public AddEditFacetDialog(Shell parentShell, String facetName,
- String displayName, String description) {
- super(parentShell);
- this.facetName = facetName;
- this.displayName = displayName;
- this.description = description;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.FacetSection_Dialog_Title_Add);
- else
- newShell.setText(EditorMessages.FacetSection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem.setText(EditorMessages.FacetSection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- facetNameField = new StringDialogField();
-// facetNameField.setRequired(true);
- facetNameField
- .setLabelText(EditorMessages.FacetSection_Dialog_FacetName);
-
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.FacetSection_Dialog_DisplayName);
-
- descriptionField = new StringDialogField();
- descriptionField
- .setLabelText(EditorMessages.FacetSection_Dialog_Description);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- facetNameField.doFillIntoGrid(null, composite, numberOfColumns);
- displayNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- descriptionField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(facetNameField.getTextControl(null,
- composite));
-
- // set the initial value for these fields.
- facetNameField.setText(facetName);
- displayNameField.setText(displayName);
- descriptionField.setText(description);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- protected void okPressed() {
- facetName = facetNameField.getText();
- displayName = displayNameField.getText();
- description = descriptionField.getText();
- super.okPressed();
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public String getFacetName() {
- return facetName;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public void setFacetName(String facetName) {
- this.facetName = facetName;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
deleted file mode 100644
index d02bc7344..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaBeanProperty;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaBeanUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaClassUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The dialog is for adding and editing managed property.
- *
- * @author sfshi
- *
- */
-public class AddEditManagedPropertyDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int DEFAULT_CONTROL_WIDTH = 200;
-
- private ComboDialogField nameField;
-
- private ClassButtonDialogField classField;
-
- private ComboDialogField valueTypeField;
-
- private StringButtonDialogField valueField;
-
- private IProject project;
-
- private String propertyName;
-
- private String propertyClass;
-
- private String valueType;
-
- /**
- * the value could be a string, or instance of <code>NullValueType</code>,
- * <code>MapEntriesType</code> and <code>ListEntriesType</code>.
- */
- private Object valueObject;
-
- private ManagedBeanType managedBean;
-
- /**
- * the list of this bean properties.
- */
- private List beanPropertyList;
-
- /**
- * the managed-property object that is editing, but it will be read-only.
- */
- private ManagedPropertyType managedProperty;
-
- // private FormToolkit toolkit;
-
- private Composite parent;
-
- public static final String[] valueTypes = { IFacesConfigConstants.VALUE,
- IFacesConfigConstants.NULL_VALUE,
- IFacesConfigConstants.MAP_ENTRIES,
- IFacesConfigConstants.LIST_ENTRIES };
-
- private boolean isNew;
-
- private AbstractFacesConfigSection section;
-
- /**
- * constructor for adding a managed property.
- *
- * @param parentShell
- * @param managedBean
- */
- public AddEditManagedPropertyDialog(Shell parentShell,
- ManagedBeanType managedBean, AbstractFacesConfigSection section) {
- super(parentShell);
- this.isNew = true;
- this.managedBean = managedBean;
- this.section = section;
- }
-
- /**
- *
- * @param parentShell
- * @param managedProperty
- */
- public AddEditManagedPropertyDialog(Shell parentShell,
- ManagedPropertyType managedProperty, AbstractFacesConfigSection section) {
- super(parentShell);
- this.isNew = false;
- this.managedProperty = managedProperty;
- this.managedBean = (ManagedBeanType) managedProperty.eContainer();
- this.section = section;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText("Add Managed Property");
- else
- newShell.setText("Edit Managed Property");
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- this.parent = container;
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- nameField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY
- | SWT.BORDER);
- nameField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_PropertyName);
-
- int propertyCount = 0;
- beanPropertyList = getBeanPropertyList(managedBean);
- if (beanPropertyList != null)
- propertyCount = beanPropertyList.size();
-
- if (propertyCount > 0) {
- String[] propertyNames = new String[propertyCount];
-
- for (int i = 0; i < propertyCount; i++) {
- JavaBeanProperty property = (JavaBeanProperty) beanPropertyList
- .get(i);
- propertyNames[i] = property.getName();
- }
- nameField.setItems(propertyNames);
- }
-
- nameField.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- handleNameSelection(((ComboDialogField) field).getText());
- }
- });
-
- classField = new ClassButtonDialogField(null);
- classField.setProject(getProject());
- classField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_PropertyClass);
-
- valueTypeField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY
- | SWT.BORDER);
- valueTypeField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_ValueType);
-
- valueTypeField.setItems(valueTypes);
- valueTypeField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- updateValueStatus();
- }
- });
-
- valueField = new StringButtonDialogField(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- handleChangeValue(valueTypeField.getText(),
- ((StringButtonDialogField) field).getText());
- }
-
- });
-
- valueField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_Value);//$NON-NLS-1$
- valueField.setButtonLabel(EditorMessages.UI_Button_Edit_more);
-
- valueField.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- valueObject = ((StringButtonDialogField) field).getText();
-
- }
- });
-
- GridData data = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(data);
-
- int numberOfColumns = 5;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- container.setLayout(gl);
-
- nameField.doFillIntoGrid(null, container, numberOfColumns);
- LayoutUtil.setWidthHint(nameField.getComboControl(null, container),
- DEFAULT_CONTROL_WIDTH);
-
- classField.doFillIntoGrid(null, container, numberOfColumns - 1);
- data = new GridData(SWT.FILL, SWT.CENTER, false, false);
- data.horizontalSpan = 2;
- classField.getChangeControl(null, container).setLayoutData(data);
- LayoutUtil.setWidthHint(classField.getTextControl(null, container),
- DEFAULT_CONTROL_WIDTH);
-
- valueTypeField.doFillIntoGrid(null, container, numberOfColumns);
-
- valueField.doFillIntoGrid(null, container, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(classField.getTextControl(null,
- container));
-
- valueTypeField.selectItem(0);
-
- if (!isNew && managedProperty != null) {
- initFields();
- }
-
- return container;
- }
-
- private void initFields() {
-
- if (managedProperty.getPropertyName() != null)
- nameField.setText(managedProperty.getPropertyName()
- .getTextContent());
-
- if (managedProperty.getPropertyClass() != null)
- classField.setText(managedProperty.getPropertyClass()
- .getTextContent());
-
- if (managedProperty.getValue() != null) {
- valueTypeField.setText(valueTypes[0]);
- valueField.setText(managedProperty.getValue().getTextContent());
- } else if (managedProperty.getNullValue() != null)
- valueTypeField.setText(valueTypes[1]);
- else if (managedProperty.getMapEntries() != null)
- valueTypeField.setText(valueTypes[2]);
- else if (managedProperty.getListEntries() != null)
- valueTypeField.setText(valueTypes[3]);
- else
- valueTypeField.setText(valueTypes[0]);
- updateValueStatus();
- }
-
- /**
- * @param text
- */
- protected void handleNameSelection(String text) {
- int propertyCount = 0;
- if (beanPropertyList != null)
- propertyCount = beanPropertyList.size();
-
- if (propertyCount > 0) {
- for (int i = 0; i < propertyCount; i++) {
- JavaBeanProperty property = (JavaBeanProperty) beanPropertyList
- .get(i);
-
- if (property.getName().equals(text.trim())) {
- classField.setText(property.getQualifiedType());
- break;
- }
- }
- }
-
- }
-
- private void updateValueStatus() {
- if (valueField == null) {
- return;
- }
- valueObject = null;
- if (valueTypeField.getText().equalsIgnoreCase(
- IFacesConfigConstants.NULL_VALUE)) {
- valueField.setEnabled(false);
- valueObject = FacesConfigFactory.eINSTANCE.createNullValueType();
- } else if (valueTypeField.getText().equalsIgnoreCase(
- IFacesConfigConstants.MAP_ENTRIES)
- || valueTypeField.getText().equalsIgnoreCase(
- IFacesConfigConstants.LIST_ENTRIES)) {
- valueField.getTextControl(null, parent).setEditable(false);
- valueField.setEnabled(true);
- } else {
- valueObject = "";
- valueField.getTextControl(null, parent).setEditable(true);
- valueField.setEnabled(true);
- }
- }
-
- /**
- * @param textControl
- */
- protected void handleChangeValue(String valueType, String value) {
- if (valueType.equalsIgnoreCase(IFacesConfigConstants.VALUE)) {
- handleChangeLongStringValue(value);
- } else if (valueType
- .equalsIgnoreCase(IFacesConfigConstants.MAP_ENTRIES)) {
- handleChangeMapEntries();
- } else if (valueType
- .equalsIgnoreCase(IFacesConfigConstants.LIST_ENTRIES)) {
- handleChangeListEntries();
- }
- }
-
- /**
- * @param textControl
- */
- private void handleChangeLongStringValue(String value) {
- EditValueDialog valueDialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), value);
- if (valueDialog.open() == Window.OK) {
- valueField.setText((String) valueDialog.getResultData());
- valueObject = valueDialog.getResultData();
- }
- }
-
- /**
- *
- */
- private void handleChangeMapEntries() {
-
- MapEntriesType mapEntries;
-
- if (valueObject instanceof MapEntriesType)
- mapEntries = (MapEntriesType) valueObject;
- else if (isNew || managedProperty.getMapEntries() == null) {
- mapEntries = FacesConfigFactory.eINSTANCE.createMapEntriesType();
- } else {
- mapEntries = (MapEntriesType) EcoreUtil.copy(managedProperty
- .getMapEntries());
- }
-
- EditMapEntriesDialog dialog = new EditMapEntriesDialog(EditorPlugin
- .getActiveShell(), mapEntries, section);
- if (dialog.open() == Dialog.OK) {
- valueObject = dialog.getMapEntries();
- } else {
- //user cancel the dialog, then restore.
- if (!isNew && managedProperty.getMapEntries() != null)
- valueObject = (MapEntriesType) EcoreUtil.copy(managedProperty
- .getMapEntries());
- // else
- // valueObject = null;
- }
- }
-
- private void handleChangeListEntries() {
- ListEntriesType listEntries;
-
- if (valueObject instanceof ListEntriesType)
- listEntries = (ListEntriesType) valueObject;
- else if (isNew || managedProperty.getListEntries() == null) {
- listEntries = FacesConfigFactory.eINSTANCE.createListEntriesType();
- } else {
- listEntries = (ListEntriesType) EcoreUtil.copy(managedProperty
- .getListEntries());
- }
-
- EditListEntriesDialog dialog = new EditListEntriesDialog(EditorPlugin
- .getActiveShell(), listEntries, section);
- if (dialog.open() == Dialog.OK) {
- valueObject = dialog.getListEntries();
- } else {
- //user cancel the dialog, then restore.
- if (!isNew && managedProperty.getListEntries() != null)
- valueObject = (ListEntriesType) EcoreUtil.copy(managedProperty
- .getListEntries());
- // else
- // valueObject = null;
- }
- }
-
- /**
- * Get a list of JavaBeanProperty that from the managed bean class.
- *
- * @return
- */
- private List getBeanPropertyList(ManagedBeanType managedBean) {
- if (managedBean.getManagedBeanClass() == null)
- return null;
- String beanClassName = managedBean.getManagedBeanClass()
- .getTextContent();
- IType classType = JavaClassUtils.getType(getProject(), beanClassName);
- if (classType == null) {
- return null;
- }
- List list = new ArrayList();
- JavaBeanProperty[] properties = JavaBeanUtils
- .getBeanProperties(classType);
- if (properties != null) {
- for (int i = 0; i < properties.length; i++) {
- list.add(properties[i]);
- }
- }
- return list;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- public IProject getProject() {
- if (project == null) {
- project = (IProject) section.getPage().getEditor().getAdapter(
- IProject.class);
- }
- return project;
- }
-
- /**
- *
- */
- protected void okPressed() {
- propertyName = nameField.getText();
- propertyClass = classField.getText();
- valueType = valueTypeField.getText();
-
- super.okPressed();
- }
-
- public String getPropertyClass() {
- return propertyClass;
- }
-
- public void setAttributeClass(String attributeClass) {
- this.propertyClass = attributeClass;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public void setAttributeName(String attributeName) {
- this.propertyName = attributeName;
- }
-
- public String getValueType() {
- return valueType;
- }
-
- public void setValueType(String defaultValue) {
- this.valueType = defaultValue;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public Object getValueObject() {
- return valueObject;
- }
-
- public void setValueObject(Object valueObject) {
- this.valueObject = valueObject;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
deleted file mode 100644
index 0545cc647..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The dialog is for adding and editing map-entry.
- *
- * @author sfshi
- *
- */
-public class AddEditMapEntryDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int VALUE_DEFAULT_LINENUMS = 10;
-
- private boolean isNew;
-
- private StringDialogField keyField;
-
- private Button nullValueTypeButton;
-
- private StringDialogField valueField;
-
- private String key;
-
- private String value;
-
- private boolean isNullValue;
-
- public AddEditMapEntryDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param attributeName
- * @param attributeClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditMapEntryDialog(Shell parentShell, String attributeName,
- String attributeClass, String defaultValue, String suggestedValue) {
- super(parentShell);
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- // TODO change it to "add"
- newShell.setText(EditorMessages.MapEntryEditPage_Title);
- else
- newShell.setText(EditorMessages.MapEntryEditPage_Title);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.numColumns = 1;
- container.setLayout(gl);
-
- layoutKeySection(container);
- layoutValueSection(container);
- if (!isNew) {
- initFields();
- }
- return container;
- }
-
- private void initFields() {
- keyField.setText(key);
- if (this.isNullValue) {
- nullValueTypeButton.setSelection(true);
- valueField.setText("");
- valueField.setEnabled(false);
- } else {
- nullValueTypeButton.setSelection(false);
- valueField.setEnabled(true);
- valueField.setText(value);
- }
- }
-
- public void layoutKeySection(Composite parent) {
- keyField = new StringDialogField();
- keyField.setLabelText(EditorMessages.MapEntryEditGroup_Key); //$NON-NLS-1$
- Composite
-
- keySection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- keySection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- keySection.setLayout(gl);
-
- keyField.doFillIntoGrid(null, keySection, numberOfColumns);
-
- LayoutUtil.setGrabHorizontal(keyField.getTextControl(null, keySection),
- true);
-
- }
-
- public void layoutValueSection(Composite parent) {
- Composite
-
- valueSection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- valueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- gl.verticalSpacing = 10;
- gl.marginHeight = 10;
- valueSection.setLayout(gl);
-
- nullValueTypeButton = SWTUtils.createCheckBox(valueSection,
- IFacesConfigConstants.NULL_VALUE, 2);
-
- nullValueTypeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- valueField.setEnabled(!nullValueTypeButton.getSelection());
-
- }
-
- });
- valueField = new StringDialogField(VALUE_DEFAULT_LINENUMS);
-
- valueField.setLabelText(EditorMessages.ValueEditGroup_Value); //$NON-NLS-1$
- valueField.doFillIntoGrid(null, valueSection, numberOfColumns);
-
- gd = (GridData) valueField.getLabelControl(null, valueSection)
- .getLayoutData();
- gd.verticalAlignment = gd.verticalAlignment | GridData.GRAB_VERTICAL;
- LayoutUtil.setHorizontalGrabbing(valueField.getTextControl(null,
- valueSection));
-
- gd = (GridData) valueField.getTextControl(null, valueSection)
- .getLayoutData();
- gd.verticalAlignment = gd.verticalAlignment | GridData.FILL_VERTICAL;
-
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /**
- *
- */
- protected void okPressed() {
-
- key = this.keyField.getText().trim();
- value = this.valueField.getText().trim();
- isNullValue = nullValueTypeButton.getSelection();
- super.okPressed();
- }
-
- public boolean isNullValue() {
- return isNullValue;
- }
-
- public void setNullValue(boolean isNullValue) {
- this.isNullValue = isNullValue;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
deleted file mode 100644
index f55c0ebd3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * The dialog is for adding and editing property.
- *
- * @author sfshi
- *
- */
-public class AddEditPropertyDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private StringDialogField propertyNameField;
-
- private ClassButtonDialogField propertyClassField;
-
- private StringDialogField defaultValueField;
-
- private StringDialogField suggestedValueField;
-
- private IProject project;
-
- private boolean isNew;
-
- private String propertyName;
-
- private String propertyClass;
-
- private String defaultValue;
-
- private String suggestedValue;
-
- /**
- *
- * @param parentShell
- * @param isNew
- */
- public AddEditPropertyDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param propertyName
- * @param propertyClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditPropertyDialog(Shell parentShell, String propertyName,
- String propertyClass, String defaultValue, String suggestedValue) {
- super(parentShell);
- this.propertyName = propertyName;
- this.propertyClass = propertyClass;
- this.defaultValue = defaultValue;
- this.suggestedValue = suggestedValue;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell
- .setText(EditorMessages.PropertySection_Dialog_Title_Add);
- else
-
- newShell
- .setText(EditorMessages.PropertySection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem
- .setText(EditorMessages.PropertySection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- propertyNameField = new StringDialogField();
- // propertyNameField.setRequired(true);
- propertyNameField
- .setLabelText(EditorMessages.PropertySection_Dialog_PropertyName);
-
- propertyClassField = new ClassButtonDialogField(getProject());
- // propertyClassField.setRequired(true);
- propertyClassField
- .setLabelText(EditorMessages.PropertySection_Dialog_PropertyClass);//$NON-NLS-1$
-
- propertyClassField.setAutoOpenResource(false);
-
- defaultValueField = new StringDialogField();
- defaultValueField
- .setLabelText(EditorMessages.PropertySection_Dialog_DefaultValue);
-
- suggestedValueField = new StringDialogField();
- suggestedValueField
- .setLabelText(EditorMessages.PropertySection_Dialog_SuggestedValue);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- propertyNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- propertyClassField.doFillIntoGrid(null, composite, numberOfColumns);
-
- defaultValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- suggestedValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(propertyClassField.getTextControl(
- null, composite));
-
- // set the initial value for these fields.
- propertyNameField.setText(propertyName);
- propertyClassField.setText(propertyClass);
- defaultValueField.setText(defaultValue);
- suggestedValueField.setText(suggestedValue);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- protected IProject getProject() {
- return project;
- }
-
- protected void okPressed() {
- propertyName = propertyNameField.getText();
- propertyClass = propertyClassField.getText();
- defaultValue = defaultValueField.getText();
- suggestedValue = suggestedValueField.getText();
-
- super.okPressed();
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getPropertyClass() {
- return propertyClass;
- }
-
- public void setPropertyClass(String propertyClass) {
- this.propertyClass = propertyClass;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
- }
-
- public String getSuggestedValue() {
- return suggestedValue;
- }
-
- public void setSuggestedValue(String suggestedValue) {
- this.suggestedValue = suggestedValue;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
deleted file mode 100644
index 5dd9dc118..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * @author Bryan Yang
- *
- */
-public class AddEditRendererDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private StringDialogField rendererNameField;
-
- private ClassButtonDialogField rendererClassField;
-
- private StringButtonDialogField componentFamilyField;
-
- private StringDialogField renderTypeField;
-
- private IProject project;
-
- private String rendererName;
-
- private String rendererClass;
-
- private String componentFamily;
-
- private String rendererType;
-
- private boolean isNew;
-
- private IFacesConfigPage page;
-
- public AddEditRendererDialog(Shell parentShell, IFacesConfigPage page,
- boolean isNew) {
- super(parentShell);
- this.page = page;
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param attributeName
- * @param attributeClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditRendererDialog(Shell parentShell, String rendererName,
- String rendererClass, String componentFamily, String renderType) {
- super(parentShell);
- this.rendererName = rendererName;
- this.rendererClass = rendererClass;
- this.componentFamily = componentFamily;
- this.rendererType = renderType;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.RendererSection_Dialog_Title_Add);
- else
- newShell.setText(EditorMessages.RendererSection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem
- .setText(EditorMessages.RendererSection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- rendererNameField = new StringDialogField();
- rendererNameField
- .setLabelText(EditorMessages.RendererSection_Dialog_DisplayName);
-
- rendererClassField = new ClassButtonDialogField(getProject());
-// rendererClassField.setRequired(true);
- rendererClassField
- .setLabelText(EditorMessages.RendererSection_Dialog_RendererClass);//$NON-NLS-1$
- rendererClassField.setProject(getProject());
- rendererClassField.setSuperClassName(IFacesConfigConstants.RENDERER_SUPER_CLASS);
- rendererClassField.setAutoOpenResource(false);
-
- componentFamilyField = new StringButtonDialogField(
- new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- Shell shell = EditorPlugin.getActiveShell();
- ComponentListDialog dialog = new ComponentListDialog(
- shell,
- page,
- page.getInput(),
- EditorMessages.RendererSection_Dialog_ComponentFamilyCaption,
- EditorMessages.RendererSection_Dialog_ComponentFamilyLabel);
- if (dialog.open() == Dialog.OK) {
- componentFamilyField.setText(dialog.getValue());
- }
- }
- });
- componentFamilyField
- .setLabelText(EditorMessages.RendererSection_Dialog_ComponentFamilyValue);
-// componentFamilyField.setRequired(true);
-
- renderTypeField = new StringDialogField();
-// renderTypeField.setRequired(true);
- renderTypeField
- .setLabelText(EditorMessages.RendererSection_Dialog_TypeValue);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- rendererNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- componentFamilyField.doFillIntoGrid(null, composite, numberOfColumns);
-
- renderTypeField.doFillIntoGrid(null, composite, numberOfColumns);
-
- rendererClassField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(rendererClassField.getTextControl(
- null, composite));
-
- // set the initial value for these fields.
- rendererNameField.setText(rendererName);
- rendererClassField.setText(rendererClass);
- componentFamilyField.setText(componentFamily);
- renderTypeField.setText(rendererType);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- public IProject getProject() {
- return project;
- }
-
- /**
- *
- */
- protected void okPressed() {
- rendererName = rendererNameField.getText();
- rendererClass = rendererClassField.getText();
- componentFamily = componentFamilyField.getText();
- rendererType = renderTypeField.getText();
-
- super.okPressed();
- }
-
- public String getRendererClass() {
- return rendererClass;
- }
-
- public void setRendererClass(String rendererClass) {
- this.rendererClass = rendererClass;
- }
-
- public String getRendererName() {
- return rendererName;
- }
-
- public void setRendererName(String rendererName) {
- this.rendererName = rendererName;
- }
-
- public String getComponentFamily() {
- return componentFamily;
- }
-
- public void setComponentFamily(String componentFamily) {
- this.componentFamily = componentFamily;
- }
-
- public String getRendererType() {
- return rendererType;
- }
-
- public void setRendererType(String rendererType) {
- this.rendererType = rendererType;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java
deleted file mode 100644
index 8c71f5cac..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Bryan Yang
- *
- */
-public class CommonListDialog extends Dialog implements
- ISelectionChangedListener, ISelectionProvider {
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private Text inputText;
-
- private StructuredViewer structuredViewer;
-
- private String value;
-
- private IFacesConfigPage page;
-
- private Object input;
-
- private String label;
-
- private String caption;
-
- /** The mini width for the text control */
- private static final int TEXT_MINI_WIDTH = 100;
-
- protected CommonListDialog(Shell parentShell, IFacesConfigPage page,
- Object input, String caption, String label) {
- super(parentShell);
- this.page = page;
- this.input = input;
- this.label = label;
- this.caption = caption;
- parentShell.setText(caption);
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(caption);
- }
-
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite composite = SWTUtils.createComposite(parent, 1);
-
- SWTUtils.createLabel(composite, label, 1); //$NON-NLS-1$
-
- inputText = SWTUtils.createTextBox(composite, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = TEXT_MINI_WIDTH;
- inputText.setLayoutData(gd);
-
- structuredViewer = createViewer(composite);
- structuredViewer.addSelectionChangedListener(this);
-
- return composite;
- }
-
- /**
- * Create the structured viewer, set up content & label provider for it.
- * Defaultly create a tableviewer.
- *
- * @param parent
- * @param toolkit
- * @return
- */
- protected StructuredViewer createViewer(Composite parent) {
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- gd.widthHint = 150;
- parent.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- parent.setLayout(layout);
-
- TableViewer tableViewer = new TableViewer(parent, SWT.SINGLE
- | SWT.H_SCROLL | SWT.V_SCROLL);
- gd = new GridData(GridData.FILL_BOTH);
- tableViewer.getControl().setLayoutData(gd);
-
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
- configViewer(tableViewer);
- tableViewer.setInput(input);
-
- return tableViewer;
- }
-
- /**
- * set the structuredViewer's input
- *
- * @param input
- */
- private void setViewerInput(Object input) {
- structuredViewer.setInput(input);
- this.input = input;
- }
-
- /**
- * get the input object of this section.
- */
- public Object getInput() {
- return input;
- }
-
- /**
- * set input object for this section.
- */
- public void setInput(Object newInput) {
- input = newInput;
- setViewerInput(input);
- }
-
- /**
- * Config the viewer, such as set a filter and so on. Sub classes should
- * override this method to add filter.
- *
- * @param structuredViewer
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
-
-
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- public ISelection getSelection() {
- return structuredViewer.getSelection();
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * the convenient method to get the AdapterFactory instance of the editor;
- *
- * @return the AdapterFactory instance.
- */
- public AdapterFactory getAdapterFactory() {
- return (AdapterFactory) page.getEditor().getAdapter(
- AdapterFactory.class);
- }
-
- /**
- * the convenient method to get the EditingDomain instance of the editor;
- *
- * @return the EditingDomain instance.
- */
- public EditingDomain getEditingDomain() {
- return (EditingDomain) page.getEditor().getAdapter(EditingDomain.class);
- }
-
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- refresh();
- }
-
- private void refresh()
- {
- inputText.setText(value) ;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java
deleted file mode 100644
index 19f1f4dbc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ComponentListDialog extends CommonListDialog {
-
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- for (Iterator iter = ssel.iterator(); iter.hasNext();) {
- ComponentType element = (ComponentType) iter.next();
- if (element.getComponentType() != null)
- setValue(element.getComponentType().getTextContent());
- else
- setValue("");
- }
-
- }
- }
-
- protected ComponentListDialog(Shell parentShell, IFacesConfigPage page,
- Object input, String caption, String label) {
- super(parentShell, page, input, caption, label);
- }
-
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getComponentType()
- .isInstance(element);
- }
- });
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
deleted file mode 100644
index 53932bd08..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.JavaUIHelper;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class DialogUtil {
-
- public static String openClassDialog(Shell shell, IProject project,
- String superType, int tyle) {
- SelectionDialog dialog = (SelectionDialog) JavaUIHelper
- .openSelectionDialog(shell, project, superType, tyle);
- dialog.setTitle(EditorMessages.FindType);
- dialog.setMessage(EditorMessages.FindType_Filter);
- if (dialog.open() == SelectionDialog.OK) {
- Object[] result = dialog.getResult();
- IType searchedType = (IType) result[0];
- return searchedType.getFullyQualifiedName();
- }
- return null;
- }
-
- public static String openRenderKitDialog(Shell shell,
- FacesConfigType facesConfig) {
- if (facesConfig != null) {
- EList list = facesConfig.getRenderKit();
- ArrayList ids = new ArrayList();
- for (int i = 0, n = list.size(); i < n; i++) {
- RenderKitIdType renderKitId = ((RenderKitType) list.get(i))
- .getRenderKitId();
- if (renderKitId != null) {
- if (!"".equals(renderKitId.getTextContent())) {
- ids.add(renderKitId.getTextContent());
- }
- }
- }
- String[] idArray = (String[]) ids.toArray(new String[ids.size()]);
- Arrays.sort(idArray);
- ListChoiceDialog dialog = new ListChoiceDialog(
- shell,
- idArray,
- EditorMessages.DefaultRenderKitIDSection_Wizard_Page_LabelText);
- if (dialog.open() == SelectionDialog.OK) {
- String result = dialog.getResult();
- if (!"".equals(result)) {
- return result;
- }
- }
- }
- return null;
- }
-
- public static String openLocaleDialog(Shell shell, List existedLocaleList) {
- LocaleDialog dialog = new LocaleDialog(shell, existedLocaleList);
- if (dialog.open() == Window.OK) {
- String result = dialog.getResult();
- if (!"".equals(result)) {
- return result;
- }
- }
- return null;
- }
-
- public static String openMessageBundleDialog(Shell shell, IProject project,
- List existedBundleList) {
- IJavaProject javaProject = null;
-
- try {
- if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
- javaProject = JavaCore.create(project);
- } else {
- return null;
- }
- } catch (CoreException e) {
- // Ignore
- }
- MessageBundleSelectionDialog dialog = new MessageBundleSelectionDialog(
- shell, javaProject, existedBundleList);
-
- if (dialog.open() == SelectionDialog.OK) {
- String newValue = (String) dialog.getResult()[0];
- if (!"".equalsIgnoreCase(newValue)) {
- return newValue;
- }
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
deleted file mode 100644
index 9a08b7297..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
+++ /dev/null
@@ -1,385 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- *
- * @author sfshi
- *
- */
-public class EditListEntriesDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private ClassButtonDialogField valueClassField;
-
- private IProject project;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ListEntriesType listEntries;
-
- private AbstractFacesConfigSection section;
-
- /**
- *
- * @param parentShell
- * @param mapEntries
- * the map-entries element that working on.
- */
- public EditListEntriesDialog(Shell parentShell,
- ListEntriesType listEntries, AbstractFacesConfigSection section) {
- super(parentShell);
- this.listEntries = listEntries;
- this.section = section;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText("Editing list-entries");
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridData data = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- // gl.marginHeight = 0;
- container.setLayout(gl);
- createKeyValueSection(container);
- createTableSection(container);
-
- initFields();
- return container;
- }
-
- private void initFields() {
-
- if (listEntries.getValueClass() != null)
- valueClassField.setText(listEntries.getValueClass()
- .getTextContent());
-
- tableViewer.setInput(listEntries);
- }
-
- private void createKeyValueSection(Composite parent) {
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
- Composite typeSelectionSection = SWTUtils.createComposite(parent,
- SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
-
- valueClassField.doFillIntoGrid(null, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(valueClassField.getTextControl(null,
- parent));
- }
-
- /**
- *
- * @param parent
- */
- private void createTableSection(Composite parent) {
- Composite mapValueSection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- mapValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- mapValueSection.setLayout(gl);
-
- DialogField valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$
-
- valuesTitle.doFillIntoGrid(null, mapValueSection, numberOfColumns);
-
- Table mapTable = new Table(mapValueSection, SWT.FULL_SELECTION
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-
- mapTable.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- updateButtonsStatus();
-
- }
-
- });
- mapTable.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected(null);
- }
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- mapTable.setLayoutData(gd);
- mapTable.setHeaderVisible(true);
- mapTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- layout.addColumnData(new ColumnWeightData(1, true));
- mapTable.setLayout(layout);
-
- TableColumn keyCol = new TableColumn(mapTable, SWT.NONE);
- keyCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
- layout.addColumnData(new ColumnWeightData(1, true));
- keyCol.setResizable(true);
-
- tableViewer = new TableViewer(mapTable);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getValueType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE.getNullValueType()
- .isInstance(element);
- }
- });
-
- Composite operationContainer = null;
-
- operationContainer = SWTUtils
- .createComposite(mapValueSection, SWT.NONE);
-
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
- addButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
- editButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected(e);
- }
-
- });
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove); //$NON-NLS-1$
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
-
- private AdapterFactory getAdapterFactory() {
- return section.getAdapterFactory();
- }
-
- private void addButtonSelected(SelectionEvent e) {
-
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, false, null);
- if (dialog.open() == Dialog.OK) {
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- listEntries.getNullValue().add(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- listEntries.getValue().add(value);
- }
- }
-
- }
-
- private void editButtonSelected(SelectionEvent e) {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- boolean isNullValue;
- String valueText = null;
- if (select instanceof NullValueType)
- isNullValue = true;
- else {
- isNullValue = false;
- valueText = ((ValueType) select).getTextContent();
- }
-
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, isNullValue, valueText);
- if (dialog.open() == Dialog.OK) {
- if (isNullValue && !dialog.isNullValue()) {
- listEntries.getNullValue().remove(select);
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- listEntries.getValue().add(value);
- } else if (!isNullValue && dialog.isNullValue()) {
- listEntries.getValue().remove(select);
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- listEntries.getNullValue().add(nullValue);
- } else if (!isNullValue && !dialog.isNullValue()) {
- ((ValueType) select).setTextContent((String) dialog
- .getResultData());
- }
- }
- }
-
- private void removeButtonSelected() {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- if (select instanceof NullValueType)
- listEntries.getNullValue().remove(select);
- else
- listEntries.getValue().remove(select);
- tableViewer.refresh();
- updateButtonsStatus();
- }
-
- public void updateButtonsStatus() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- *
- */
- protected void okPressed() {
-
- String valueClass = valueClassField.getText();
- if (listEntries.getValueClass() != null) {
- listEntries.getValueClass().setTextContent(valueClass);
- } else {
- ValueClassType valueClassType = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClassType.setTextContent(valueClass);
- listEntries.setValueClass(valueClassType);
- }
- super.okPressed();
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- public IProject getProject() {
- if (project == null) {
- project = (IProject) section.getPage().getEditor().getAdapter(
- IProject.class);
- }
- return project;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public ListEntriesType getListEntries() {
- return listEntries;
- }
-
- public void setListEntries(ListEntriesType listEntries) {
- this.listEntries = listEntries;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
deleted file mode 100644
index 812233506..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
+++ /dev/null
@@ -1,420 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntryType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- *
- * @author sfshi
- *
- */
-public class EditMapEntriesDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private ClassButtonDialogField keyClassField;
-
- private ClassButtonDialogField valueClassField;
-
- private IProject project;;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- private MapEntriesType mapEntries;
-
- private AbstractFacesConfigSection section;
-
- /**
- *
- * @param parentShell
- * @param mapEntries
- * the map-entries element that working on.
- */
- public EditMapEntriesDialog(Shell parentShell, MapEntriesType mapEntries,
- AbstractFacesConfigSection section) {
- super(parentShell);
- this.mapEntries = mapEntries;
- this.section = section;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText("Editing map-entries");
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridData data = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- // gl.marginHeight = 0;
- container.setLayout(gl);
- createKeyValueSection(container);
- createTableSection(container);
-
- initFields();
- return container;
- }
-
- private void initFields() {
-
- if (mapEntries.getKeyClass() != null)
- keyClassField.setText(mapEntries.getKeyClass().getTextContent());
-
- if (mapEntries.getValueClass() != null)
- valueClassField
- .setText(mapEntries.getValueClass().getTextContent());
-
- tableViewer.setInput(mapEntries);
- }
-
- private void createKeyValueSection(Composite parent) {
- keyClassField = new ClassButtonDialogField(getProject());
- keyClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_KeyClass);//$NON-NLS-1$
-
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
-
- Composite typeSelectionSection = SWTUtils.createComposite(parent,
- SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
-
- keyClassField.doFillIntoGrid(null, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(keyClassField.getTextControl(null,
- parent));
-
- valueClassField.doFillIntoGrid(null, typeSelectionSection,
- numberOfColumns);
- }
-
- /**
- *
- * @param parent
- */
- private void createTableSection(Composite parent) {
- Composite mapValueSection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- mapValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- mapValueSection.setLayout(gl);
-
- DialogField valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$
-
- valuesTitle.doFillIntoGrid(null, mapValueSection, numberOfColumns);
-
- Table mapTable = new Table(mapValueSection, SWT.FULL_SELECTION
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-
- mapTable.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- updateButtonsStatus();
-
- }
-
- });
- mapTable.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected(null);
- }
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- mapTable.setLayoutData(gd);
- mapTable.setHeaderVisible(true);
- mapTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- mapTable.setLayout(layout);
-
- TableColumn keyCol = new TableColumn(mapTable, SWT.NONE);
- keyCol
- .setText(EditorMessages.InitializationSection_MapTable_Key);//$NON-NLS-1$
- layout.addColumnData(new ColumnWeightData(1, true));
- keyCol.setResizable(true);
-
- TableColumn valueCol = new TableColumn(mapTable, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
-
- valueCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
- valueCol.setResizable(true);
-
- tableViewer = new TableViewer(mapTable);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getMapEntryType()
- .isInstance(element);
- }
- });
-
- // map's operation buttons
- Composite operationContainer = null;
-
- operationContainer = SWTUtils
- .createComposite(mapValueSection, SWT.NONE);
-
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
- addButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
- editButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected(e);
- }
-
- });
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove); //$NON-NLS-1$
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
-
- public IProject getProject() {
- if (project == null) {
- project = (IProject) section.getPage().getEditor().getAdapter(
- IProject.class);
- }
- return project;
- }
- private AdapterFactory getAdapterFactory() {
- return section.getAdapterFactory();
- }
-
- private void addButtonSelected(SelectionEvent e) {
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), true);
- if (dialog.open() == Dialog.OK) {
- MapEntryType mapEntry = FacesConfigFactory.eINSTANCE
- .createMapEntryType();
- if (dialog.getKey() != null) {
- KeyType key = FacesConfigFactory.eINSTANCE.createKeyType();
- key.setTextContent(dialog.getKey());
- mapEntry.setKey(key);
- }
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- mapEntry.setNullValue(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- mapEntry.setValue(value);
- }
-
- mapEntries.getMapEntry().add(mapEntry);
- }
-
- }
-
- private void editButtonSelected(SelectionEvent e) {
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), false);
- if (mapEntry.getKey() != null)
- dialog.setKey(mapEntry.getKey().getTextContent());
- if (mapEntry.getNullValue() != null)
- dialog.setNullValue(true);
- else if (mapEntry.getValue() != null)
- dialog.setValue(mapEntry.getValue().getTextContent());
-
- if (dialog.open() == Dialog.OK) {
- if (mapEntry.getKey() != null)
- mapEntry.getKey().setTextContent(dialog.getKey());
- else {
- KeyType keyType = FacesConfigFactory.eINSTANCE.createKeyType();
- keyType.setTextContent(dialog.getKey());
- mapEntry.setKey(keyType);
- }
- if (dialog.isNullValue()) {
- if (mapEntry.getValue() != null)
- EcoreUtil.remove(mapEntry.getValue());
- // mapEntry.eUnset(FacesConfigPackage.eINSTANCE.getMapEntryType_Value());
- mapEntry.setNullValue(FacesConfigFactory.eINSTANCE
- .createNullValueType());
-
- } else {
- if (mapEntry.getNullValue() != null)
- EcoreUtil.remove(mapEntry.getNullValue());
- if (mapEntry.getValue() != null)
- mapEntry.getValue().setTextContent(dialog.getValue());
- else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- mapEntry.setValue(value);
- }
-
- }
- tableViewer.refresh(mapEntry);
- }
-
- }
-
- private void removeButtonSelected() {
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- mapEntries.getMapEntry().remove(mapEntry);
- tableViewer.refresh();
- updateButtonsStatus();
- }
-
- public void updateButtonsStatus() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- *
- */
- protected void okPressed() {
- KeyClassType keyClass = FacesConfigFactory.eINSTANCE
- .createKeyClassType();
- keyClass.setTextContent(this.keyClassField.getText().trim());
- mapEntries.setKeyClass(keyClass);
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(this.valueClassField.getText().trim());
- mapEntries.setValueClass(valueClass);
- super.okPressed();
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public MapEntriesType getMapEntries() {
- return mapEntries;
- }
-
- public void setMapEntries(MapEntriesType mapEntries) {
- this.mapEntries = mapEntries;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
deleted file mode 100644
index 9acf2e03d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-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;
-
-/**
- * This dialog is used to edit managed bean's property. if the
- * bDefinitionEditable is true, the property's name, class type, and initial
- * value can be edit and changed. otherwise, only initial value can be changed.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class EditValueDialog extends Dialog {
-
- /** default dialog width and height */
- private static final int VALUE_WIDTH = 380;
-
- private static final int VALUE_HEIGHT = 220;
-
- private String value;
-
- /** property's initla value text control */
- private Text valueText;
-
- private Button nullValueTypeButton;
-
- private boolean isNullButtonShown = false;
-
- private boolean isNullValue;
-
- public EditValueDialog(Shell parentShell, String value) {
- super(parentShell);
- this.value = value;
- this.isNullButtonShown = false;
- }
-
- public EditValueDialog(Shell parentShell, boolean isNullButtonShown,
- boolean isNullValue, String value) {
- super(parentShell);
- this.isNullValue = isNullValue;
- this.value = value;
- this.isNullButtonShown = isNullButtonShown;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createDialogArea(Composite)
- */
- protected Control createDialogArea(Composite parent) {
- GridLayout gridLayout;
- Composite container = (Composite) super.createDialogArea(parent);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- gridLayout.marginHeight = 10;
- gridLayout.marginWidth = 10;
- container.setLayout(gridLayout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- if (this.isNullButtonShown) {
- nullValueTypeButton = SWTUtils.createCheckBox(container,
- IFacesConfigConstants.NULL_VALUE, 2);
- nullValueTypeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- valueText.setEnabled(!nullValueTypeButton.getSelection());
- isNullValue = nullValueTypeButton.getSelection();
- }
-
- });
- }
-
- DialogField valueTitle = new DialogFieldBase();
- // ManagedBeansPage.ManagedBeanInitializationSection.MapTable.Title =
- // Values:
- valueTitle
- .setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_Value);//$NON-NLS-1$
- valueTitle.doFillIntoGrid(null, container, 1);
-
- gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = VALUE_WIDTH;
- gd.heightHint = VALUE_HEIGHT;
- valueText = new Text(container, SWT.MULTI | SWT.BORDER);
- valueText.setLayoutData(gd);
-
- initFields();
- return container;
- }
-
- private void initFields() {
-
- if (isNullButtonShown && isNullValue) {
- nullValueTypeButton.setSelection(true);
- valueText.setEnabled(false);
- } else if (value != null) {
- valueText.setText(value);
- }
- }
-
- /**
- * create a inital value group
- *
- * @param container -
- * parent composite control
- */
- protected void createValueSection(Composite container) {
- Composite valueSection = new Composite(container, SWT.NONE);
- GridLayout gl = new GridLayout();
- // gl.marginHeight = 20;
- gl.numColumns = 2;
- valueSection.setLayout(gl);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- valueSection.setLayoutData(gd);
-
- Label lblValue = new Label(valueSection, SWT.LEFT);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 100;
- lblValue.setLayoutData(gd);
-
- // ManagedBeanPropertyEditDialog.Value = Value:
- lblValue
- .setText(EditorMessages.ManagedBeanPropertyEditDialog_Value); //$NON-NLS-1$
-
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.FILL_HORIZONTAL);
- gd.widthHint = 200;
- valueText = new Text(valueSection, SWT.BORDER);
- valueText.setLayoutData(gd);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createButtonsForButtonBar(Composite)
- */
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#configureShell(Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(EditorMessages.ValueEditDialog_Title); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#buttonPressed(int)
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == IDialogConstants.CANCEL_ID) {
- setReturnCode(CANCEL);
- close();
- return;
- } else if (buttonId == IDialogConstants.OK_ID) {
- value = valueText.getText();
- setReturnCode(OK);
- close();
- return;
- }
- super.buttonPressed(buttonId);
- }
-
- public Object getResultData() {
- return value;
- }
-
- public boolean isNullValue() {
- return this.isNullButtonShown && isNullValue;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java
deleted file mode 100644
index de863aa0b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class ListChoiceDialog extends Dialog {
- /** The mini width for the text control */
- private static final int TEXT_MINI_WIDTH = 350;
-
- /** The mini width for the table viewer control */
- private static final int TABLEVIEWER_MINI_WIDTH = 200;
-
- private Text inputText;
-
- private TableViewer tableViewer;
-
- private String[] items;
-
- private String result;
-
- private String labelString;
-
- public ListChoiceDialog(Shell parentShell, String[] items, String labelString) {
- super(parentShell);
- this.items = items;
- if(this.items == null)
- {
- this.items = new String[0];
- }
- this.labelString = labelString;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite composite = SWTUtils.createComposite(parent, 1);
-
- SWTUtils.createLabel(composite, labelString, 1);
-
- inputText = SWTUtils.createTextBox(composite, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = TEXT_MINI_WIDTH;
- inputText.setLayoutData(gd);
-
- inputText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- result = inputText.getText();
- }
- });
-
- createTableViewer(composite);
- return composite;
- }
-
- /**
- * @param composite
- */
- private void createTableViewer(Composite composite) {
- tableViewer = new TableViewer(composite, SWT.BORDER | SWT.H_SCROLL
- | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = TABLEVIEWER_MINI_WIDTH;
- tableViewer.getControl().setLayoutData(gd);
- tableViewer.add(items);
- tableViewer
- .addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event
- .getSelection();
- if (selection != null) {
- String text = (String) selection.getFirstElement();
- if (text != null && text.length() > 0) {
- result = text;
- inputText.setText(text);
- }
- }
- }
- });
- }
-
- public String getResult()
- {
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
deleted file mode 100644
index d5fad8e9e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class LocaleDialog extends StatusDialog {
- private Text inputText;
-
- private TableViewer tableViewer;
-
- private String newLocale;
-
- private List existedLocaleList;
-
- private List itemsList;
-
- /** The mini width for the text control */
- private static final int TEXT_MINI_WIDTH = 350;
-
- /** The mini width for the table viewer control */
- private static final int TABLEVIEWER_MINI_WIDTH = 200;
-
- class LocaleViewerFilter extends ViewerFilter {
- private String locale;
-
- LocaleViewerFilter(String locale) {
- super();
- this.locale = locale;
- }
-
- public boolean select(Viewer v, Object parent, Object object) {
- if (object instanceof String) {
- if (null == locale || locale.length() == 0) {
- return true;
- } else {
- String aLocale = (String) object;
- return aLocale.startsWith(this.locale);
- }
- }
- return false;
- }
- }
-
- /**
- *
- * @param parentShell
- * @param existedLocaleList
- */
- public LocaleDialog(Shell parentShell, List existedLocaleList) {
- super(parentShell);
- this.existedLocaleList = existedLocaleList;
- Locale[] locales = Locale.getAvailableLocales();
- itemsList = new ArrayList(locales.length);
-
- for (int i = 0, n = locales.length; i < n; i++) {
- itemsList.add(locales[i].toString());
- }
-
- setStatusMessage(EditorMessages.LocaleConfigSection_Wizard_Page_AlreadyExistsError);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(EditorMessages.LocaleConfigSection_Wizard_WindowTitle);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.dialog.StatusDialog#createDialogContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogContents(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- parent.setLayout(layout);
-
- SWTUtils
- .createLabel(
- parent,
- EditorMessages.LocaleConfigSection_Wizard_Page_LabelText,
- 1);
-
- inputText = SWTUtils.createTextBox(parent, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = TEXT_MINI_WIDTH;
- inputText.setLayoutData(gd);
-
- inputText.addKeyListener(new KeyAdapter() {
- public void keyReleased(KeyEvent e) {
- newLocale = inputText.getText();
- tableViewer.resetFilters();
- tableViewer.addFilter(new LocaleViewerFilter(newLocale));
- tableViewer.add(itemsList.toArray());
- updateStatus();
- }
- });
-
- createTableViewer(parent);
- return parent;
- }
-
- /**
- * @param composite
- */
- private void createTableViewer(Composite composite) {
- tableViewer = new TableViewer(composite, SWT.BORDER | SWT.H_SCROLL
- | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = TABLEVIEWER_MINI_WIDTH;
- tableViewer.getControl().setLayoutData(gd);
- tableViewer.add(itemsList.toArray());
-
- tableViewer
- .addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
-
- IStructuredSelection selection = (IStructuredSelection) event
- .getSelection();
- if (selection != null) {
- String text = (String) selection.getFirstElement();
- if (text != null && text.length() > 0) {
- newLocale = text;
- inputText.setText(text);
- updateStatus();
- }
- }
- }
- });
-
- }
-
- protected boolean isValid()
- {
- if (existedLocaleList != null && existedLocaleList.contains(newLocale)) {
- return false;
- }
- return true;
- }
-
- public String getResult()
- {
- return newLocale;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
deleted file mode 100644
index 028eae649..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.jsf.facesconfig.common.IFileFolderConstants;
-import org.eclipse.jst.jsf.facesconfig.common.dialogs.ResourceOnClasspathDialog;
-import org.eclipse.jst.jsf.facesconfig.emf.MessageBundleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author sfshi
- * @version
- */
-public class MessageBundleSelectionDialog extends ResourceOnClasspathDialog {
- /** A list contains the resoursebundles existing in faces config */
- private List resourceBundles;
-
- private String selectPropertyFileMessage = EditorMessages.MessageBundleSection_Dialog_Message_SelectPropertyFile;
-
- private String alreadyExistStatusMessage = EditorMessages.MessageBundleSection_Dialog_Message_AlreadyExists;
-
- private static final String[] PROPERTIES_FILES_SUFFIXS = new String[] { IFileFolderConstants.EXT_PROPERTIES };
-
- /**
- * @param parentShell
- * @param project
- * @param resourceBundles
- */
- public MessageBundleSelectionDialog(Shell parentShell,
- IJavaProject project, List resourceBundles) {
- super(parentShell, project);
- this.resourceBundles = resourceBundles;
- setSuffixs(PROPERTIES_FILES_SUFFIXS);
-
- setTitle(EditorMessages.MessageBundleSection_Dialog_Title);
- setViewerSorter(new MessageBundleViewerSorter());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogs.TreeViewerSelectionDialog#isValidSelection(java.lang.Object)
- */
- protected boolean isValidSelection(Object selection) {
- if (!(super.isValidSelection(selection))) {
- setStatusMessage(selectPropertyFileMessage);
- return false;
- }
-
- List selectionList = new ArrayList();
- selectionList.add(selection);
- this.setResult(selectionList);
- Object result = super.getResult()[0];
- if (null == result) {
- setStatusMessage(selectPropertyFileMessage);
- return false;
- }
-
- String newResourceBundle = (String) result;
-
- if (isAlreadyExist(newResourceBundle)) {
- this.setStatusMessage(alreadyExistStatusMessage);
- return false;
- }
-
- return true;
- }
-
- /**
- * Determine whether this resource bundle file has already been defined in
- * faces config.
- *
- * @return boolean
- */
- private boolean isAlreadyExist(String resourceBundleString) {
- if (null == resourceBundleString || resourceBundleString.length() == 0) {
- return true;
- }
-
- if (null == resourceBundles) {
- return false;
- }
-
- for (int i = 0; i < resourceBundles.size(); i++) {
- MessageBundleType node = (MessageBundleType) resourceBundles.get(i);
- String rbName = node.getTextContent();
- if (rbName != null && rbName.equalsIgnoreCase(resourceBundleString)) {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java
deleted file mode 100644
index e6778ef89..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.text.Collator;
-
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.common.IFileFolderConstants;
-
-/**
- * @author sfshi
- * @version
- */
-public class MessageBundleViewerSorter extends ViewerSorter {
-
- /**
- *
- */
- public MessageBundleViewerSorter() {
- super();
- }
-
- /**
- * @param collator
- */
- public MessageBundleViewerSorter(Collator collator) {
- super(collator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
- */
- public int category(Object element) {
- if (element instanceof IPackageFragmentRoot
- && !(element instanceof JarPackageFragmentRoot)) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) element;
- if (IFileFolderConstants.FOLDER_SOURCE
- .equals(root.getElementName())) {
- return 0;
- }
- return 1;
- }
-
- return 2;
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java
deleted file mode 100644
index 5eec46153..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-
-/**
- * A common Dialog with validation information.
- */
-public abstract class StatusDialog extends Dialog {
- /** The validation image */
- private Label statusImage;
-
- /** The validation message */
- private Label statusLabel;
-
- /** The validation message content */
- private String statusMessage;
-
- /**
- *
- * @param parentShell
- */
- protected StatusDialog(Shell parentShell) {
- super(parentShell);
- }
-
- /**
- * Creates and returns the contents of the upper part of this dialog (above
- * the validation widgets). User should create Layout for the parent parameter.
- *
- * @param parent
- * the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected abstract Control createDialogContents(Composite parent);
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite area = (Composite) super.createDialogArea(parent);
- area.setLayout(new GridLayout(2,false));
-
- Composite contents = new Composite(area, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 2;
- contents.setLayoutData(gd);
- createDialogContents(contents);
-
- statusImage = createLabel(area);
- statusImage.setImage(JFaceResources
- .getImage(Dialog.DLG_IMG_MESSAGE_ERROR));
- statusLabel = createLabel(area);
- statusImage.setVisible(false);
- return area;
- }
-
- private Label createLabel(Composite parent) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = 1;
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- return label;
- }
-
- protected abstract boolean isValid();
-
- protected void updateStatus() {
- if (isValid()) {
- statusImage.setVisible(false);
- statusLabel.setText(""); //$NON-NLS-1$
- getButton(IDialogConstants.OK_ID).setEnabled(true);
- } else {
- statusImage.setVisible(true);
- statusLabel.setText(statusMessage == null ? "" : statusMessage);//$NON-NLS-1$
- getButton(IDialogConstants.OK_ID).setEnabled(false);
- }
- }
-
- public String getStatusMessage() {
- return statusMessage;
- }
-
- public void setStatusMessage(String statusMessage) {
- this.statusMessage = statusMessage;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
deleted file mode 100644
index e15062743..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacetType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererType;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ComponentDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ConverterDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.RenderkitDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ValidatorDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ComponentMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ConverterMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.RenderkitMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ValidatorMasterSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * The "Components" page of faces config editor.
- *
- * @author sfshi
- *
- */
-public class ComponentsPage extends FacesConfigMasterDetailPage {
-
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage";
-
- private IContentOutlinePage contentOutlinePage;
-
- /**
- * Constructor of ComponentsPage;
- *
- * @param editor
- * the facesconfig editor;
- */
- public ComponentsPage(FacesConfigEditor editor) {
- super(editor, "ComponentsPage",
- EditorMessages.FacesConfigEditor_Components_TabName);
- }
-
- /**
- * Create the master sections;
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage#createMasterSections(Composite,
- * IManagedForm, FormToolkit, FacesConfigMasterDetailPage)
- */
- protected FacesConfigMasterSection[] createMasterSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page) {
- FacesConfigMasterSection componentMaster = new ComponentMasterSection(
- composite, managedForm, toolkit, page);
- componentMaster.getSection().setExpanded(true);
- GridData gd = new GridData(GridData.FILL_BOTH);
- componentMaster.getSection().setLayoutData(gd);
-
- FacesConfigMasterSection converterMaster = new ConverterMasterSection(
- composite, managedForm, toolkit, page);
- converterMaster.getSection().setExpanded(false);
- GridData convertergd = new GridData(GridData.FILL_HORIZONTAL);
- converterMaster.getSection().setLayoutData(convertergd);
-
- FacesConfigMasterSection renderkitMaster = new RenderkitMasterSection(
- composite, managedForm, toolkit, page);
- renderkitMaster.getSection().setExpanded(false);
- GridData renderkitgd = new GridData(GridData.FILL_HORIZONTAL);
- renderkitMaster.getSection().setLayoutData(renderkitgd);
-
- FacesConfigMasterSection validatorMaster = new ValidatorMasterSection(
- composite, managedForm, toolkit, page);
- validatorMaster.getSection().setExpanded(false);
- GridData valicatorgd = new GridData(GridData.FILL_HORIZONTAL);
- validatorMaster.getSection().setLayoutData(valicatorgd);
-
- return new FacesConfigMasterSection[] { componentMaster,
- converterMaster, renderkitMaster, validatorMaster };
- }
-
- /**
- * get the details page;
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage#getPageKey(Object
- * object)
- * @param key
- * the eClass object of a component.
- */
- public IDetailsPage getPage(Object key) {
- IDetailsPage detailsPage = null;
- if (key instanceof EClass) {
- EClass eClass = (EClass) key;
- if (eClass.getClassifierID() == FacesConfigPackage.COMPONENT_TYPE) {
- detailsPage = new ComponentDetailsPage(this);
- } else if (eClass.getClassifierID() == FacesConfigPackage.RENDER_KIT_TYPE) {
- detailsPage = new RenderkitDetailsPage(this);
- } else if (eClass.getClassifierID() == FacesConfigPackage.CONVERTER_TYPE) {
- detailsPage = new ConverterDetailsPage(this);
- } else if (eClass.getClassifierID() == FacesConfigPackage.VALIDATOR_TYPE) {
- detailsPage = new ValidatorDetailsPage(this);
- }
-
- if (detailsPage instanceof ISelectionProvider) {
- ((ISelectionProvider) detailsPage)
- .addSelectionChangedListener(this);
- }
- }
- return detailsPage;
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- return super.getAdapter(adapter);
- }
-
- private IContentOutlinePage getOutlinePage() {
-
- if (contentOutlinePage == null) {
- // The content outline is just a tree.
- //
- class ComponentsContentOutlinePage extends ContentOutlinePage {
- public void createControl(Composite parent) {
- super.createControl(parent);
- TreeViewer contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- // Set up the tree viewer.
- contentOutlineViewer
- .setContentProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- contentOutlineViewer
- .setLabelProvider(new AdapterFactoryLabelProvider(
- adapterFactory));
- contentOutlineViewer.addFilter(new ViewerFilter() {
-
- public boolean select(Viewer viewer,
- Object parentElement, Object element) {
- return FacesConfigPackage.eINSTANCE
- .getComponentType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getConverterType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getRenderKitType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getValidatorType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getAttributeType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getPropertyType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getFacetType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getRendererType().isInstance(
- element);
- }
- });
-
- contentOutlineViewer.setSorter(new ViewerSorter());
- contentOutlineViewer.setInput(getInput());
- }
-
- }
-
- contentOutlinePage = new ComponentsContentOutlinePage();
-
- // Listen to selection so that we can handle it is a special
- // way.
- //
- contentOutlinePage
- .addSelectionChangedListener(new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- addSelectionChangedListener((ContentOutlinePage) contentOutlinePage);
- }
-
- return contentOutlinePage;
-
- }
-
- /**
- * handle the selection changed event from outline page.
- *
- * @param selection
- */
- public void setSelection(ISelection selection) {
-
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) selection;
- IStructuredSelection currentSelection = (IStructuredSelection) this
- .getSelection();
- if ((!ss.isEmpty())
- && (!currentSelection.isEmpty())
- && (ss.getFirstElement() == currentSelection
- .getFirstElement())) {
- return;
- }
- EObject component = null;
- if (ss.getFirstElement() instanceof AttributeType
- || ss.getFirstElement() instanceof PropertyType
- || ss.getFirstElement() instanceof FacetType
- || ss.getFirstElement() instanceof RendererType) {
- component = ((EObject) ss.getFirstElement()).eContainer();
- } else if (ss.getFirstElement() instanceof EObject) {
- component = (EObject) ss.getFirstElement();
- }
-
- if (component != null) {
- FacesConfigMasterSection section = null;
- if (FacesConfigPackage.eINSTANCE.getComponentType().isInstance(
- component)) {
- section = facesConfigMasterSections[0];
- } else if (FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(component)) {
- section = facesConfigMasterSections[1];
- } else if (FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(component)) {
- section = facesConfigMasterSections[2];
- } else if (FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(component)) {
- section = facesConfigMasterSections[3];
- }
-
- if (!section.getSection().isExpanded()) {
- this.closeOtherSections(section);
- GridData gd = new GridData(GridData.FILL_BOTH);
- section.getSection().setLayoutData(gd);
- section.getSection().setExpanded(true);
- }
- IStructuredSelection newselection = new StructuredSelection(
- component);
- section.getStructuredViewer().setSelection(newselection);
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java
deleted file mode 100644
index 9925d93de..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.FacesConfigDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-
-/**
- * In some cases the page is a master-detail style, the content of the right
- * side will change according user's selection on the left side. This is an
- * abstract implementation of IFacesConfigPage, with a FacesConfigMasterSection
- * array and a DetailsPart.
- *
- * @author sfshi
- *
- */
-public abstract class FacesConfigMasterDetailPage extends FormPage implements
- IFacesConfigPage, IDetailsPageProvider, ISelectionChangedListener,
- ISelectionProvider, IEditingDomainProvider {
-
- private final static Image BANNER_IMAGE = EditorPlugin.getDefault()
- .getImage("form_banner.gif");
-
- protected FacesConfigMasterSection[] facesConfigMasterSections;
-
- private DetailsPart detailsPart;
-
- private Object input;
-
- private List selectionChangedListeners = new ArrayList();
-
- private IPropertySheetPage propertySheetPage;
-
- private ISelection currentSelection = null;
-
- /**
- *
- * @param editor
- * the editor part that this page belongs to;
- * @param id
- * page id;
- * @param title
- * page title;
- */
- public FacesConfigMasterDetailPage(FacesConfigEditor editor, String id,
- String title) {
- super(editor, id, title);
- }
-
- public EditingDomain getEditingDomain() {
- return ((FacesConfigEditor) getEditor()).getEditingDomain();
- }
-
- /**
- *
- * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
- */
- protected void createFormContent(IManagedForm managedForm) {
-
- ScrolledForm form = managedForm.getForm();
- form.setText(this.getTitle());//$NON-NLS-1$
- form.setBackgroundImage(BANNER_IMAGE); //$NON-NLS-1$
- fillBody(managedForm, managedForm.getToolkit());
- managedForm.refresh();
- }
-
- /**
- * set input for this page when the it got activated at the first time; if
- * it's not the first time, then refresh the page.
- *
- * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
- */
- public void setActive(boolean active) {
- super.setActive(active);
- if (active) {
- if (getInput() != ((FacesConfigEditor) getEditor())
- .getFacesConfig()) {
- setInput(((FacesConfigEditor) getEditor()).getFacesConfig());
- } else {
- this.refresh();
- }
- }
- }
-
- public boolean isEditor() {
- return true;
- }
-
- /**
- *
- * @param managedForm
- * @param toolkit
- */
- private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
- Composite body = managedForm.getForm().getBody();
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.horizontalSpacing = 0;
- gridLayout.verticalSpacing = 0;
- gridLayout.numColumns = 2;
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- body.setLayout(gridLayout);
-
- SashForm sashForm = new SashForm(body, SWT.NULL);
- managedForm.getToolkit().adapt(sashForm, false, false);
- sashForm.setMenu(body.getMenu());
- sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite leftContainer = toolkit.createComposite(sashForm);
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- leftContainer.setLayout(gl);
-
- // create master sections here
- facesConfigMasterSections = createMasterSections(leftContainer,
- managedForm, toolkit, this);
-
- if (facesConfigMasterSections != null) {
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- FacesConfigMasterSection aSection = facesConfigMasterSections[i];
- aSection.initialize();
- aSection.addSelectionChangedListener(this);
-
- }
- }
-
- detailsPart = new DetailsPart(managedForm, sashForm, SWT.NULL);
- managedForm.addPart(detailsPart);
-
- detailsPart.setPageLimit(4);
- detailsPart.setPageProvider(this);
-
- detailsPart.initialize(managedForm);
-
- sashForm.setWeights(new int[] { 40, 60 });
-
- getSite().setSelectionProvider(this);
- }
-
- /**
- * Create the detail sections, and set layout data and initial expand state
- * for them.
- *
- * @param composite
- * @param managedForm
- * @param toolkit
- * @param page
- * @return
- */
- abstract protected FacesConfigMasterSection[] createMasterSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page);
-
- /**
- * set input object; also set into all the master sections.
- */
- public void setInput(Object input) {
- if (facesConfigMasterSections != null) {
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- facesConfigMasterSections[i].setInput(input);
- }
- }
- this.input = input;
- }
-
- /**
- * get the input object.
- */
- public Object getInput() {
- return input;
- }
-
- /**
- * Defaultly use the EClass object of the selected object as page key. Sub
- * classes can override this method if there has other ways.
- *
- * @param object
- */
- public Object getPageKey(Object object) {
- if (object instanceof EObject) {
- EObject eObject = (EObject) object;
- return eObject.eClass();
- }
- return null;
- }
-
- /**
- * Subclasses should create and return an IDetailsPage instance according
- * what the key is. Defaultly the EClass object of the selected object in
- * the structured viewer will be taken as the page key.
- *
- * @see getPageKey
- *
- */
- abstract public IDetailsPage getPage(Object key);
-
- /**
- * transfer the selection changed event to detail part.
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- currentSelection = event.getSelection();
- if (event.getSource() instanceof FacesConfigMasterSection) {
- FacesConfigMasterSection source = (FacesConfigMasterSection) event
- .getSource();
-
- detailsPart.selectionChanged(source, event.getSelection());
-
- if (source.getSection().isExpanded()) {
- for (int i = 0, n = selectionChangedListeners.size(); i < n; i++) {
- ((ISelectionChangedListener) selectionChangedListeners
- .get(i)).selectionChanged(event);
- }
- }
- } else if (event.getSource() instanceof FacesConfigDetailsPage) {
- for (int i = 0, n = selectionChangedListeners.size(); i < n; i++) {
- ((ISelectionChangedListener) selectionChangedListeners.get(i))
- .selectionChanged(event);
- }
- }
- }
-
- /**
- * set other sections' expand state to false, except this section;
- *
- * @param section
- * the section that be expanded.
- */
- public void closeOtherSections(FacesConfigMasterSection section) {
-
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- FacesConfigMasterSection aSection = facesConfigMasterSections[i];
- if (aSection != section && aSection.getSection().isExpanded()) {
- aSection.getSection().setExpanded(false);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- aSection.getSection().setLayoutData(gd);
- }
- }
- }
-
- /**
- * refresh this page, the expanded section and the detail page will got
- * refreshed.
- */
- public void refresh() {
-
- // only refresh the expanded section;
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- if (facesConfigMasterSections[i].getSection().isExpanded()) {
- facesConfigMasterSections[i].refresh();
- }
- }
-
- // refresh the detail page, it will call detail sections
- // to got refreshed.
- if (detailsPart.getCurrentPage() != null) {
- detailsPart.getCurrentPage().refresh();
- }
- }
-
- /**
- * get the section that is expanded.
- *
- * @return
- */
- protected FacesConfigMasterSection getActiveSection() {
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
-
- if (facesConfigMasterSections[i].getSection().isExpanded()) {
- return facesConfigMasterSections[i];
- }
- }
- return null;
-
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.add(listener);
- }
-
- public ISelection getSelection() {
- if(currentSelection != null)
- return currentSelection;
- return StructuredSelection.EMPTY;
-
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
- return super.getAdapter(adapter);
- }
-
- private IPropertySheetPage getPropertySheetPage() {
-
- AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) getEditor()
- .getAdapter(EditingDomain.class);
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- if (propertySheetPage == null) {
- propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
- public void setSelectionToViewer(List selection) {
- // FacesConfigEditor.this.setSelectionToViewer(selection);
- // FacesConfigEditor.this.setFocus();
- }
-
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- // getActionBarContributor().shareGlobalActions(this,
- // actionBars);
- }
- };
- ((ExtendedPropertySheetPage) propertySheetPage)
- .setPropertySourceProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- // this.addSelectionChangedListener((ExtendedPropertySheetPage)
- // propertySheetPage);
- }
-
- return propertySheetPage;
-
- }
-
- /**
- * @return the facesConfigMasterSections
- */
- public FacesConfigMasterSection[] getFacesConfigMasterSections() {
- return facesConfigMasterSections;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java
deleted file mode 100644
index bce882230..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.ui.forms.editor.IFormPage;
-
-/**
- *
- *
- * @author sfshi
- *
- */
-public interface IFacesConfigPage extends IFormPage {
-
- void setInput(Object input);
-
- Object getInput();
-
- void refresh();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
deleted file mode 100644
index da3a8c382..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.IntroductionSection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * Handle the Introduction page for the pageflow editor.
- *
- * @author jchoi
- */
-public class IntroductionPage extends FormPage implements IFacesConfigPage, ISelectionProvider{
- /**
- * @param facesConfigEditor
- */
- public IntroductionPage(FacesConfigEditor facesConfigEditor) {
- super(facesConfigEditor, IntroductionPage.class.getName(),
- EditorMessages.editor_pageflow_page_intro_name);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
- */
- protected void createFormContent(IManagedForm managedForm) {
- // get the form
- ScrolledForm form = managedForm.getForm();
- FormToolkit toolkit = getEditor().getToolkit();
- form.setText(EditorMessages.editor_pageflow_page_intro_title);
-
- form.setBackgroundImage(EditorPlugin.getDefault().getImage("form_banner.gif"));
-
- // create a layout
- TableWrapLayout layout = new TableWrapLayout();
- layout.numColumns = 1;
- layout.makeColumnsEqualWidth = true;
- form.getBody().setLayout(layout);
-
- IntroductionSection introPart = new IntroductionSection(
- FacesConfigEditor.EDITOR_ID, managedForm, toolkit,
- EditorMessages.editor_pageflow_page_intro_help_HelpContextID,
- EditorMessages.editor_pageflow_page_intro_help_HelpToolTip);
-
- TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
- td.colspan = 1;
- introPart.setLayoutData(td);
-
- getSite().setSelectionProvider(this);
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.IFormPage#isEditor()
- */
- public boolean isEditor() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- public void removeSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage#getInput()
- */
- public Object getInput() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage#refresh()
- */
- public void refresh() {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage#setInput(java.lang.Object)
- */
- public void setInput(Object input) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
deleted file mode 100644
index b21692146..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ManagedBeanDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanMasterSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanPage extends FacesConfigMasterDetailPage {
-
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage";
-
- private IContentOutlinePage contentOutlinePage;
-
- public ManagedBeanPage(FacesConfigEditor editor) {
- super(editor, "ManagedBeanPage",
- EditorMessages.FacesConfigEditor_ManagedBeans_TabName);
- }
-
- protected FacesConfigMasterSection[] createMasterSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page) {
- FacesConfigMasterSection managedBeanMaster = new ManagedBeanMasterSection(
- composite, managedForm, toolkit, page);
- managedBeanMaster.getSection().setExpanded(true);
- GridData gd = new GridData(GridData.FILL_BOTH);
- managedBeanMaster.getSection().setLayoutData(gd);
- return new FacesConfigMasterSection[] { managedBeanMaster };
- }
-
- public IDetailsPage getPage(Object key) {
- IDetailsPage detailsPage = null;
- if (key instanceof EClass) {
- EClass eClass = (EClass) key;
- if (eClass.getClassifierID() == FacesConfigPackage.MANAGED_BEAN_TYPE) {
- detailsPage = new ManagedBeanDetailsPage(this);
- }
-
- if (detailsPage instanceof ISelectionProvider) {
- ((ISelectionProvider) detailsPage)
- .addSelectionChangedListener(this);
- }
- }
- return detailsPage;
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- return super.getAdapter(adapter);
- }
-
- private IContentOutlinePage getOutlinePage() {
-
- if (contentOutlinePage == null) {
- // The content outline is just a tree.
- //
- class ManagedBeanContentOutlinePage extends ContentOutlinePage {
- public void createControl(Composite parent) {
- super.createControl(parent);
- TreeViewer contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- // Set up the tree viewer.
- contentOutlineViewer
- .setContentProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- contentOutlineViewer
- .setLabelProvider(new AdapterFactoryLabelProvider(
- adapterFactory));
- contentOutlineViewer.addFilter(new ViewerFilter() {
-
- public boolean select(Viewer viewer,
- Object parentElement, Object element) {
- return FacesConfigPackage.eINSTANCE
- .getManagedBeanType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getManagedPropertyType()
- .isInstance(element);
- }
- });
-
- contentOutlineViewer.setSorter(new ViewerSorter());
- contentOutlineViewer.setInput(getInput());
- }
-
- }
-
- contentOutlinePage = new ManagedBeanContentOutlinePage();
-
- // Listen to selection so that we can handle it is a special
- // way.
- //
- contentOutlinePage
- .addSelectionChangedListener(new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- // this.addSelectionChangedListener((ContentOutlinePage)
- // contentOutlinePage);
- }
-
- return contentOutlinePage;
-
- }
-
- /**
- * handle the selection changed event from outline page.
- *
- * @param selection
- */
- public void setSelection(ISelection selection) {
-
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) selection;
- ManagedBeanType bean = null;
- if (ss.getFirstElement() instanceof ManagedBeanType) {
- bean = (ManagedBeanType) ss.getFirstElement();
- } else if (ss.getFirstElement() instanceof ManagedPropertyType) {
- bean = (ManagedBeanType) ((ManagedPropertyType) ss
- .getFirstElement()).eContainer();
- }
-
- if (bean != null) {
- if (!getManagedBeanMasterSection().getSection().isExpanded()) {
- GridData gd = new GridData(GridData.FILL_BOTH);
- getManagedBeanMasterSection().getSection()
- .setLayoutData(gd);
- getManagedBeanMasterSection().getSection()
- .setExpanded(true);
- }
- IStructuredSelection newselection = new StructuredSelection(
- bean);
- getManagedBeanMasterSection().getStructuredViewer()
- .setSelection(newselection);
- }
- }
-
- }
-
- private ManagedBeanMasterSection getManagedBeanMasterSection() {
- return (ManagedBeanMasterSection) facesConfigMasterSections[0];
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
deleted file mode 100644
index 198aa357a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
+++ /dev/null
@@ -1,739 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
-import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ApplicationSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FactorySection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.LifecycleSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.LocaleConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OthersPageBaseSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-
-/**
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-
-/**
- * This class is the "Others" page.
- */
-public class OthersPage extends FormPage implements IFacesConfigPage,
- ISelectionProvider, ISelectionChangedListener, IEditingDomainProvider {
-
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage";
-
- private final static Image BANNER_IMAGE = EditorPlugin.getDefault()
- .getImage("form_banner.gif");
-
- private List leftSections;
-
- private List rightSections;
-
- private Object input;
-
- private List selectionChangedListeners = new ArrayList();
-
- private IPropertySheetPage propertySheetPage;
-
- private IContentOutlinePage contentOutlinePage;
-
- private ISelection currentSelection;
-
- /**
- * Constructor of OthersPage;
- *
- * @param editor
- * the facesconfig editor;
- */
- public OthersPage(FacesConfigEditor editor) {
- super(editor, "OthersPage",
- EditorMessages.FacesConfigEditor_Others_TabName);
- }
-
- protected void createFormContent(IManagedForm managedForm) {
- super.createFormContent(managedForm);
- ScrolledForm form = managedForm.getForm();
- form.setText(EditorMessages.OthersPage_Title);
- form.setBackgroundImage(BANNER_IMAGE);
- fillBody(managedForm, managedForm.getToolkit());
- managedForm.refresh();
- }
-
- private void initSection(OthersPageBaseSection section, String name,
- String description, ArrayList list) {
- section.getSection().setText(name);
- section.getSection().setDescription(description);
- section.initialize();
- section.addSelectionChangedListener(this);
- section.getSection().setExpanded(false);
- section.getSection().setLayoutData(
- new GridData(GridData.FILL_HORIZONTAL));
- list.add(section);
- }
-
- private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
- Composite body = managedForm.getForm().getBody();
-
- body.setLayout(new GridLayout());
-
- SashForm sashForm = new SashForm(body, SWT.NONE);
- managedForm.getToolkit().adapt(sashForm, false, false);
- sashForm.setMenu(body.getMenu());
- sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite leftContainer = toolkit.createComposite(sashForm);
- leftContainer.setLayout(new GridLayout());
-
- ArrayList sectionList = new ArrayList();
-
- OthersPageBaseSection section = new ApplicationSection(
- FacesConfigPackage.eINSTANCE.getActionListenerType(),
- leftContainer, managedForm, this, toolkit);
- initSection(section, EditorMessages.ActionListenerSection_Name,
- EditorMessages.ActionListenerSection_Description,
- sectionList);
- section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
- section.getSection().setExpanded(true);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getDefaultRenderKitIdType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.DefaultRenderKitIDSection_Name,
- EditorMessages.DefaultRenderKitIDSection_Description,
- sectionList);
-
- section = new LocaleConfigSection(FacesConfigPackage.eINSTANCE
- .getSupportedLocaleType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.LocaleConfigSection_Name,
- EditorMessages.LocaleConfigSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getMessageBundleType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.MessageBundleSection_Name,
- EditorMessages.MessageBundleSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getNavigationHandlerType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.NavigationHandlerSection_Name,
- EditorMessages.NavigationHandlerSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getPropertyResolverType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.PropertyResolverSection_Name,
- EditorMessages.PropertyResolverSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getStateManagerType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.StateManagerSection_Name,
- EditorMessages.StateManagerSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getVariableResolverType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.VariableResolverSection_Name,
- EditorMessages.VariableResolverSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getViewHandlerType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.ViewHandlerSection_Name,
- EditorMessages.ViewHandlerSection_Description,
- sectionList);
-
- leftSections = sectionList;
-
- sectionList = new ArrayList();
-
- Composite rightContainer = toolkit.createComposite(sashForm);
- rightContainer.setLayout(new GridLayout());
- rightContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getApplicationFactoryType(), rightContainer, managedForm,
- this, toolkit);
- initSection(section,
- EditorMessages.ApplicationFactorySection_Name,
- EditorMessages.ApplicationFactorySection_Description,
- sectionList);
- section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
- section.getSection().setExpanded(true);
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getFacesContextFactoryType(), rightContainer, managedForm,
- this, toolkit);
- initSection(section,
- EditorMessages.FacesContextFactorySection_Name,
- EditorMessages.FacesContextFactorySection_Description,
- sectionList);
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getLifecycleFactoryType(), rightContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.LifecycleFactorySection_Name,
- EditorMessages.LifecycleFactorySection_Description,
- sectionList);
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getRenderKitFactoryType(), rightContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.RenderKitFactorySection_Name,
- EditorMessages.RenderKitFactorySection_Description,
- sectionList);
-
- section = new LifecycleSection(FacesConfigPackage.eINSTANCE
- .getPhaseListenerType(), rightContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.PhaseListenerSection_Name,
- EditorMessages.PhaseListenerSection_Description,
- sectionList);
-
- rightSections = sectionList;
-
- getSite().setSelectionProvider(this);
- }
-
- /**
- * set input for this page when the it got activated at the first time; if
- * it's not the first time, then refresh the page.
- *
- * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
- */
- public void setActive(boolean active) {
- super.setActive(active);
- if (active) {
- if (getInput() != ((FacesConfigEditor) getEditor())
- .getFacesConfig()) {
- setInput(((FacesConfigEditor) getEditor()).getFacesConfig());
- } else {
- this.refresh();
- }
- }
- }
-
- /**
- *
- */
- public void setInput(Object input) {
- if (input instanceof FacesConfigType) {
- this.input = input;
- FacesConfigType facesConfig = (FacesConfigType) input;
- facesConfig.eAdapters().add(new FacesConfigOthersAdapter());
- setInputForApplicationSections(facesConfig);
- setInputForFactorySections(facesConfig);
- setInputForLifecycleSections(facesConfig);
- }
- }
-
- public boolean isEditor() {
- return true;
- }
-
- public void resetApplicationInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForApplicationSections((FacesConfigType) getInput());
- }
- }
-
- public void resetFactoryInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForFactorySections((FacesConfigType) getInput());
- }
- }
-
- public void resetLifecycleInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForLifecycleSections((FacesConfigType) getInput());
- }
- }
-
- protected void setInputForApplicationSections(FacesConfigType facesConfig) {
- ApplicationType application;
- if (facesConfig.getApplication().size() > 0) {
- application = (ApplicationType) facesConfig.getApplication().get(0);
- } else {
- application = null;
- }
- for (Iterator it = leftSections.iterator(); it.hasNext();) {
- ApplicationSection section = (ApplicationSection) it.next();
- section.setInput(application);
- }
- }
-
- protected void setInputForFactorySections(FacesConfigType facesConfig) {
- FactoryType factory;
- if (facesConfig.getFactory().size() > 0) {
- factory = (FactoryType) facesConfig.getFactory().get(0);
- } else {
- factory = null;
- }
-
- for (Iterator it = rightSections.iterator(); it.hasNext();) {
- Object section = it.next();
- if (section instanceof FactorySection)
- ((FactorySection) section).setInput(factory);
- }
- }
-
- protected void setInputForLifecycleSections(FacesConfigType facesConfig) {
- LifecycleType lifecycle;
- if (facesConfig.getLifecycle().size() > 0) {
- lifecycle = (LifecycleType) facesConfig.getLifecycle().get(0);
-
- } else {
- lifecycle = null;
- }
- for (Iterator it = rightSections.iterator(); it.hasNext();) {
- Object section = it.next();
- if (section instanceof LifecycleSection)
- ((LifecycleSection) section).setInput(lifecycle);
- }
- }
-
- public Object getInput() {
- return input;
- }
-
- public void refresh() {
-
- // only refresh the expanded section;
- for (int i = 0, n = leftSections.size(); i < n; i++) {
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- section.refresh();
- }
- }
-
- for (int i = 0, n = rightSections.size(); i < n; i++) {
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- section.refresh();
- }
- }
-
- }
-
- /**
- * set other sections' expand state to false, except this section;
- *
- * @param section
- * the section that be expanded.
- */
- public void closeOtherSections(AbstractFacesConfigSection section) {
- OthersPageBaseSection[] sections;
- if (leftSections.contains(section)) {
- sections = (OthersPageBaseSection[]) leftSections
- .toArray(new OthersPageBaseSection[leftSections.size()]);
- } else {
- sections = (OthersPageBaseSection[]) rightSections
- .toArray(new OthersPageBaseSection[rightSections.size()]);
- }
- for (int i = 0, n = sections.length; i < n; i++) {
- AbstractFacesConfigSection aSection = sections[i];
- if (aSection != section && aSection.getSection().isExpanded()) {
- aSection.getSection().setExpanded(false);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- aSection.getSection().setLayoutData(gd);
- }
- }
- }
-
- /**
- * An adapter on faces config.
- *
- * @author sfshi
- *
- */
- class FacesConfigOthersAdapter extends AdapterImpl {
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.ADD) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Application()) {
- resetApplicationInput();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Factory()) {
- resetFactoryInput();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Lifecycle()) {
- resetLifecycleInput();
- }
- }
- }
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- selectionChangedListeners.add(listener);
- }
-
- public ISelection getSelection() {
- if (currentSelection != null)
- return currentSelection;
-
- return StructuredSelection.EMPTY;
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- selectionChangedListeners.remove(listener);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- currentSelection = event.getSelection();
- if (event.getSource() instanceof OthersPageBaseSection) {
- OthersPageBaseSection source = (OthersPageBaseSection) event
- .getSource();
-
- if (source.getSection().isExpanded()) {
- for (int i = 0, n = selectionChangedListeners.size(); i < n; i++) {
- ((ISelectionChangedListener) selectionChangedListeners
- .get(i)).selectionChanged(event);
- }
- }
- }
- }
-
- /**
- * get the section that is expanded.
- *
- * @return
- */
- protected OthersPageBaseSection getActiveSection() {
- for (int i = 0, n = leftSections.size(); i < n; i++) {
-
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- return section;
- }
- }
-
- for (int i = 0, n = rightSections.size(); i < n; i++) {
-
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- return section;
- }
- }
- return null;
-
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- return super.getAdapter(adapter);
- }
-
- private IPropertySheetPage getPropertySheetPage() {
-
- AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) getEditor()
- .getAdapter(EditingDomain.class);
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- if (propertySheetPage == null) {
- propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
- public void setSelectionToViewer(List selection) {
- // FacesConfigEditor.this.setSelectionToViewer(selection);
- // FacesConfigEditor.this.setFocus();
- }
-
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- // getActionBarContributor().shareGlobalActions(this,
- // actionBars);
- }
- };
- ((ExtendedPropertySheetPage) propertySheetPage)
- .setPropertySourceProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- // this.addSelectionChangedListener((ExtendedPropertySheetPage)
- // propertySheetPage);
- }
-
- return propertySheetPage;
-
- }
-
- private IContentOutlinePage getOutlinePage() {
-
- if (contentOutlinePage == null) {
- // The content outline is just a tree.
- //
- class OthersContentOutlinePage extends ContentOutlinePage {
- public void createControl(Composite parent) {
- super.createControl(parent);
- TreeViewer contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- // Set up the tree viewer.
- contentOutlineViewer
- .setContentProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- contentOutlineViewer
- .setLabelProvider(new AdapterFactoryLabelProvider(
- adapterFactory));
- contentOutlineViewer.addFilter(new ViewerFilter() {
-
- public boolean select(Viewer viewer,
- Object parentElement, Object element) {
- return FacesConfigPackage.eINSTANCE
- .getApplicationType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getFactoryType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getLifecycleType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getActionListenerType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getDefaultRenderKitIdType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getLocaleConfigType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getDefaultLocaleType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getSupportedLocaleType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getMessageBundleType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getNavigationHandlerType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getPropertyResolverType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getStateManagerType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getVariableResolverType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getViewHandlerType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getApplicationFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getFacesContextFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getLifecycleFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getRenderKitFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getPhaseListenerType().isInstance(
- element)
-
- ;
- }
- });
-
- contentOutlineViewer.setSorter(new ViewerSorter());
- contentOutlineViewer.setInput(getInput());
- }
-
- }
-
- contentOutlinePage = new OthersContentOutlinePage();
-
- // Listen to selection so that we can handle it is a special
- // way.
- //
- contentOutlinePage
- .addSelectionChangedListener(new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- }
-
- return contentOutlinePage;
-
- }
-
- /**
- * handle the selection changed event from outline page.
- *
- * @param selection
- */
- public void setSelection(ISelection selection) {
-
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) selection;
- if (ss.isEmpty())
- return;
-
- EObject object = (EObject) ss.getFirstElement();
- OthersPageBaseSection section = null;
-
- if (FacesConfigPackage.eINSTANCE.getActionListenerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(0);
- } else if (FacesConfigPackage.eINSTANCE.getDefaultRenderKitIdType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(1);
- } else if (FacesConfigPackage.eINSTANCE.getLocaleConfigType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getDefaultLocaleType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getSupportedLocaleType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getMessageBundleType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(3);
- } else if (FacesConfigPackage.eINSTANCE.getNavigationHandlerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(4);
- } else if (FacesConfigPackage.eINSTANCE.getPropertyResolverType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(5);
- } else if (FacesConfigPackage.eINSTANCE.getStateManagerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(6);
- } else if (FacesConfigPackage.eINSTANCE.getVariableResolverType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(7);
- } else if (FacesConfigPackage.eINSTANCE.getViewHandlerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(8);
- } else if (FacesConfigPackage.eINSTANCE.getApplicationFactoryType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(0);
- } else if (FacesConfigPackage.eINSTANCE
- .getFacesContextFactoryType().isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(1);
- } else if (FacesConfigPackage.eINSTANCE.getLifecycleFactoryType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getRenderKitFactoryType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(3);
- } else if (FacesConfigPackage.eINSTANCE.getPhaseListenerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(4);
- }
- if (section != null) {
- if (!section.getSection().isExpanded()) {
- this.closeOtherSections(section);
- GridData gd = new GridData(GridData.FILL_BOTH);
- section.getSection().setLayoutData(gd);
- section.getSection().setExpanded(true);
- }
- IStructuredSelection newselection = new StructuredSelection(
- object);
- section.getTableViewer().setSelection(newselection);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()
- */
- public EditingDomain getEditingDomain() {
- return ((FacesConfigEditor) getEditor()).getEditingDomain();
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
deleted file mode 100644
index 628d492e8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewComponentsSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewGeneralSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewManagedBeanSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewNavigationSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewOthersSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * @author jchoi, Xiao-guang Zhang
- * @version
- */
-public class OverviewPage extends FormPage implements ISelectionProvider,
- IFacesConfigPage {
-
- protected static final int LAYOUT_MARGIN_HEIGHT = 2;
-
- protected static final int LAYOUT_MARGIN_WIDTH = 2;
-
- private Object input;
-
- private OverviewGeneralSection generalSection;
-
- private OverviewManagedBeanSection beanSection;
-
- private OverviewComponentsSection componentsSection;
-
- //
- private OverviewNavigationSection navigationSection;
-
- //
- private OverviewOthersSection otherSection;
-
- /**
- *
- * @param editor
- */
- public OverviewPage(FormEditor editor) {
- super(editor, "OverviewPage", "Overview");
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
- */
- protected void createFormContent(IManagedForm managedForm) {
-
- ScrolledForm form = managedForm.getForm();
- form.setText(EditorMessages.OverviewPage_PageflowOverview_summary);
- form.setBackgroundImage(EditorPlugin.getDefault().getImage(
- "form_banner.gif")); //$NON-NLS-1$
- Composite body = form.getBody();
- GridLayout gridLayout = new GridLayout();
- gridLayout.marginWidth = LAYOUT_MARGIN_WIDTH;
- gridLayout.marginHeight = LAYOUT_MARGIN_HEIGHT;
- body.setLayout(gridLayout);
- gridLayout = new GridLayout(2, true);
- form.getBody().setLayout(gridLayout);
- FormEditor editor = getEditor();
- FormToolkit toolkit = editor.getToolkit();
-
- // add overview general information
- generalSection = new OverviewGeneralSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- generalSection.initialize();
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- generalSection.getSection().setLayoutData(gd);
-
- // Navigation section
- navigationSection = new OverviewNavigationSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- navigationSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- navigationSection.getSection().setLayoutData(gd);
- navigationSection.getSection().setExpanded(true);
-
- // ManagedBeans section
- beanSection = new OverviewManagedBeanSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- beanSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- beanSection.getSection().setLayoutData(gd);
- beanSection.getSection().setExpanded(true);
-
- /* components section */
- componentsSection = new OverviewComponentsSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- componentsSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- componentsSection.getSection().setLayoutData(gd);
- componentsSection.getSection().setExpanded(true);
-
- /* other sections */
- otherSection = new OverviewOthersSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- otherSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- otherSection.getSection().setLayoutData(gd);
- otherSection.getSection().setExpanded(true);
-
- this.getSite().setSelectionProvider(this);
-
- }
-
- /**
- * set input for this page when the it got activated at the first time; if
- * it's not the first time, then refresh the page.
- *
- * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
- */
- public void setActive(boolean active) {
- super.setActive(active);
- if (active) {
- if (getInput() != ((FacesConfigEditor) getEditor())
- .getFacesConfig()) {
- setInput(((FacesConfigEditor) getEditor()).getFacesConfig());
- } else {
- this.refresh();
- }
- }
- }
-
- /**
- *
- */
- public void setInput(Object input) {
- if (input instanceof FacesConfigType) {
- this.input = input;
- navigationSection.setInput(input);
- beanSection.setInput(input);
- componentsSection.setInput(input);
- otherSection.setInput(input);
- }
- }
-
- public void refreshAll() {
- generalSection.refreshAll();
- navigationSection.refreshAll();
- beanSection.refreshAll();
- componentsSection.refreshAll();
- otherSection.refreshAll();
- }
-
- public Object getInput() {
- return input;
- }
-
- public void refresh() {
- generalSection.refresh();
- navigationSection.refresh();
- beanSection.refresh();
- componentsSection.refresh();
- otherSection.refresh();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.IFormPage#isEditor()
- */
- public boolean isEditor() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java
deleted file mode 100644
index 9a882d542..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AttributeSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ComponentGeneralSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacetSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.PropertySection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ComponentDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ComponentDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ComponentGeneralSection generalSection = new ComponentGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- AttributeSection attributeSection = new AttributeSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- attributeSection.getSection().setLayoutData(gd);
-
- FacetSection facetSection = new FacetSection(composite, managedForm,
- getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- facetSection.getSection().setLayoutData(gd);
-
- PropertySection propertySection = new PropertySection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.getSection().setLayoutData(gd);
- return new IFacesConfigSection[] { generalSection, attributeSection, facetSection,
- propertySection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java
deleted file mode 100644
index 0e720f440..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AttributeSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ConverterGeneralSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.PropertySection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ConverterDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ConverterDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ConverterGeneralSection generalSection = new ConverterGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- AttributeSection attributeSection = new AttributeSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- attributeSection.getSection().setLayoutData(gd);
-
-
- PropertySection propertySection = new PropertySection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.getSection().setLayoutData(gd);
- return new IFacesConfigSection[] { generalSection, attributeSection,
- propertySection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java
deleted file mode 100644
index 346d07339..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.AbstractFormPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * The detail part of a page. It contains several IFacesConfigSection instances.
- *
- * @author sfshi
- *
- */
-public abstract class FacesConfigDetailsPage extends AbstractFormPart implements
- IDetailsPage, ISelectionProvider, ISelectionChangedListener {
-
- private FacesConfigMasterDetailPage page;
-
- private IFacesConfigSection[] detailSections;
-
- private List selectionChangedListeners = new ArrayList();
-
- public FacesConfigDetailsPage(FacesConfigMasterDetailPage page) {
- super();
- this.page = page;
- }
-
- public void createContents(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- parent.setLayout(layout);
-
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- FormToolkit toolkit = getManagedForm().getToolkit();
- Composite detailsContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(detailsContainer);
- detailsContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.marginHeight = 0;
- detailsContainer.setLayout(gl);
-
- detailSections = createDetailSections(detailsContainer,
- getManagedForm(), toolkit, page);
- if (detailSections != null) {
- for (int i = 0, n = detailSections.length; i < n; i++) {
- detailSections[i].initialize();
- if (detailSections[i] instanceof ISelectionProvider) {
- ((ISelectionProvider) detailSections[i])
- .addSelectionChangedListener(this);
- }
- }
- }
- }
-
- /**
- * create the sub detail sections and set layout data for them.
- *
- * @param composite
- * @param managedForm
- * @param toolkit
- * @param page
- * @return
- */
- abstract protected IFacesConfigSection[] createDetailSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page);
-
- /**
- *
- */
- public void selectionChanged(IFormPart part, ISelection selection) {
- Object selectedItem = ((StructuredSelection) selection)
- .getFirstElement();
- if (detailSections != null) {
- for (int i = 0, n = detailSections.length; i < n; i++) {
- IFacesConfigSection aSection = detailSections[i];
- aSection.setInput(selectedItem);
- }
- }
-
- }
-
- public FacesConfigMasterDetailPage getPage() {
- return page;
- }
-
- public void refresh() {
- super.refresh();
- if (detailSections != null) {
- for (int i = 0, n = detailSections.length; i < n; i++) {
- detailSections[i].refresh();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- // TODO Auto-generated method stub
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java
deleted file mode 100644
index 9ee1641c9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.InitializationSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanGeneralSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ManagedBeanDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ManagedBeanGeneralSection generalSection = new ManagedBeanGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- InitializationSection initializationSection = new InitializationSection(
- composite, managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_FILL);
- initializationSection.getSection().setLayoutData(gd);
-
- return new IFacesConfigSection[] { generalSection, initializationSection};
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java
deleted file mode 100644
index efb8dd7a5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.RendererSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.RenderkitGeneralSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RenderkitDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public RenderkitDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- RenderkitGeneralSection generalSection = new RenderkitGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- RendererSection rendererSection = new RendererSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_FILL);
- rendererSection.getSection().setLayoutData(gd);
-
- return new IFacesConfigSection[] { generalSection,rendererSection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java
deleted file mode 100644
index a2385781a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AttributeSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.PropertySection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ValidatorGeneralSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ValidatorDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ValidatorDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ValidatorGeneralSection generalSection = new ValidatorGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- AttributeSection attributeSection = new AttributeSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- attributeSection.getSection().setLayoutData(gd);
-
- PropertySection propertySection = new PropertySection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.getSection().setLayoutData(gd);
- return new IFacesConfigSection[] { generalSection, attributeSection,
- propertySection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java
deleted file mode 100644
index a8471a43b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-// import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.draw2d.ScalableFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editparts.ZoomListener;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.jface.util.ListenerList;
-
-/**
- * A delegating ZoomManager.
- *
- */
-public class DelegatingZoomManager extends ZoomManager implements ZoomListener {
- /** Default string or double value of zoom level */
- private static final String DEFAULT_ZOOM_LEVEL_STRING = "100%";
-
- private static final double DEFAULT_ZOOM_LEVEL = 1;
-
- /** Initial capacity of ZoomListerner list */
- private static final int ZOOM_LISTENERLIST_INIT_SIZE = 3;
-
- /** the current ZoomManager all work is delegated to */
- private ZoomManager currentZoomManager = null;
-
- /** listeners of zoom */
- private ListenerList zoomListeners = new ListenerList(
- ZOOM_LISTENERLIST_INIT_SIZE);
-
- /**
- * Creates a new DelegatingZoomManager instance.
- */
- public DelegatingZoomManager() {
- super((ScalableFigure) null, (Viewport) null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomListener#zoomChanged(double)
- */
- public void zoomChanged(double zoom) {
- Object[] listeners = zoomListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- ((ZoomListener) listeners[i]).zoomChanged(zoom);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#addZoomListener(ZoomListener)
- */
- public void addZoomListener(ZoomListener listener) {
- zoomListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#removeZoomListener(oZoomListener)
- */
- public void removeZoomListener(ZoomListener listener) {
- zoomListeners.remove(listener);
- }
-
- /**
- * Sets the ZoomManager all work should be delegated to.
- *
- * @param zoomManager
- */
- public void setCurrentZoomManager(ZoomManager zoomManager) {
- if (null != currentZoomManager) {
- currentZoomManager.removeZoomListener(this);
- }
-
- currentZoomManager = zoomManager;
- if (null != currentZoomManager) {
- currentZoomManager.addZoomListener(this);
- zoomChanged(currentZoomManager.getZoom());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#canZoomIn()
- */
- public boolean canZoomIn() {
- if (null == currentZoomManager) {
- return false;
- }
-
- return currentZoomManager.canZoomIn();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#canZoomOut()
- */
- public boolean canZoomOut() {
- if (null == currentZoomManager) {
- return false;
- }
-
- return currentZoomManager.canZoomOut();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getMaxZoom()
- */
- public double getMaxZoom() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getMaxZoom();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getMinZoom()
- */
- public double getMinZoom() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getMinZoom();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getNextZoomLevel()
- */
- public double getNextZoomLevel() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getNextZoomLevel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getPreviousZoomLevel()
- */
- public double getPreviousZoomLevel() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getPreviousZoomLevel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getScalableFigure()
- */
- public ScalableFigure getScalableFigure() {
- if (null == currentZoomManager) {
- return null;
- }
-
- return currentZoomManager.getScalableFigure();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getUIMultiplier()
- */
- public double getUIMultiplier() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getUIMultiplier();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getViewport()
- */
- public Viewport getViewport() {
- if (null == currentZoomManager) {
- return null;
- }
-
- return currentZoomManager.getViewport();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoom()
- */
- public double getZoom() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getZoom();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoomAsText()
- */
- public String getZoomAsText() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL_STRING;
- }
-
- return currentZoomManager.getZoomAsText();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoomLevels()
- */
- public double[] getZoomLevels() {
- if (null == currentZoomManager) {
- return new double[] { DEFAULT_ZOOM_LEVEL };
- }
-
- return currentZoomManager.getZoomLevels();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoomLevelsAsText()
- */
- public String[] getZoomLevelsAsText() {
- if (null == currentZoomManager) {
- return new String[] { DEFAULT_ZOOM_LEVEL_STRING };
- }
-
- return currentZoomManager.getZoomLevelsAsText();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setUIMultiplier(double)
- */
- public void setUIMultiplier(double multiplier) {
- if (null == currentZoomManager) {
- return;
- }
-
- currentZoomManager.setUIMultiplier(multiplier);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setViewLocation(Point)
- */
- public void setViewLocation(Point p) {
- if (null == currentZoomManager) {
- return;
- }
-
- currentZoomManager.setViewLocation(p);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoom(double)
- */
- public void setZoom(double zoom) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoom(zoom);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoomAnimationStyle(int)
- */
- public void setZoomAnimationStyle(int style) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoomAnimationStyle(style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoomAsText(String)
- */
- public void setZoomAsText(String zoomString) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoomAsText(zoomString);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoomLevels(double[])
- */
- public void setZoomLevels(double[] zoomLevels) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoomLevels(zoomLevels);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#zoomIn()
- */
- public void zoomIn() {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.zoomIn();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#zoomOut()
- */
- public void zoomOut() {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.zoomOut();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#zoomTo(Rectangle)
- */
- public void zoomTo(Rectangle rect) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.zoomTo(rect);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java
deleted file mode 100644
index 72d3aafb5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionBarContributor;
-import org.eclipse.gef.ui.actions.AlignmentRetargetAction;
-import org.eclipse.gef.ui.actions.DeleteRetargetAction;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.RedoRetargetAction;
-import org.eclipse.gef.ui.actions.UndoRetargetAction;
-import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
-import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
-import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jst.jsf.facesconfig.ui.INestedActionContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.actions.ActionFactory;
-
-public class PageflowActionBarContributor extends ActionBarContributor
- implements INestedActionContributor {
-
- IEditorPart activeEditor;
-
- /*
- * (non-Javadoc)
- *
- * @see ActionBarContributor#buildActions()
- */
- protected void buildActions() {
- addRetargetAction(new UndoRetargetAction());
- addRetargetAction(new RedoRetargetAction());
- addRetargetAction(new DeleteRetargetAction());
- addRetargetAction(new ZoomInRetargetAction());
- addRetargetAction(new ZoomOutRetargetAction());
-
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.LEFT));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.CENTER));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.RIGHT));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.TOP));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.MIDDLE));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.BOTTOM));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ActionBarContributor#declareGlobalActionKeys()
- */
- public void declareGlobalActionKeys() {
-
- }
-
- public void updateActionKeys() {
- declareGlobalActionKeys();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
- */
- public void contributeToToolBar(IToolBarManager tbm) {
- tbm.add(getAction(ActionFactory.UNDO.getId()));
- tbm.add(getAction(ActionFactory.REDO.getId()));
- tbm.add(new Separator());
- tbm.add(getAction(GEFActionConstants.ALIGN_LEFT));
- tbm.add(getAction(GEFActionConstants.ALIGN_CENTER));
- tbm.add(getAction(GEFActionConstants.ALIGN_RIGHT));
- tbm.add(new Separator());
- tbm.add(getAction(GEFActionConstants.ALIGN_TOP));
- tbm.add(getAction(GEFActionConstants.ALIGN_MIDDLE));
- tbm.add(getAction(GEFActionConstants.ALIGN_BOTTOM));
-
- tbm.add(new Separator());
- String[] zoomStrings = new String[] { ZoomManager.FIT_ALL,
- ZoomManager.FIT_HEIGHT, ZoomManager.FIT_WIDTH };
- tbm.add(new ZoomComboContributionItem(getPage(), zoomStrings));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditorActionBarContributor#contributeToMenu(IMenuManager)
- */
- public void contributeToMenu(IMenuManager menubar) {
- super.contributeToMenu(menubar);
- MenuManager viewMenu = new MenuManager("View");
- viewMenu.add(getAction(GEFActionConstants.ZOOM_IN));
- viewMenu.add(getAction(GEFActionConstants.ZOOM_OUT));
- menubar.insertAfter(IWorkbenchActionConstants.M_EDIT, viewMenu);
- }
-
- public void setActiveEditor(IEditorPart editor) {
- if (editor instanceof PageflowEditor) {
- activeEditor = editor;
- // updateActionKeys();
- super.setActiveEditor(editor);
- }
- }
-
- public void update() {
- if (activeEditor != null) {
- ((PageflowEditor) activeEditor).updateActions();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java
deleted file mode 100644
index b952d3116..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.KeyStroke;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackEvent;
-import org.eclipse.gef.commands.CommandStackEventListener;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.DeleteAction;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.RedoAction;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.gef.ui.actions.StackAction;
-import org.eclipse.gef.ui.actions.UndoAction;
-import org.eclipse.gef.ui.actions.UpdateAction;
-import org.eclipse.gef.ui.actions.ZoomInAction;
-import org.eclipse.gef.ui.actions.ZoomOutAction;
-import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.gef.ui.parts.SelectionSynchronizer;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.AlignmentAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.OpenEditorAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.ShowPropertyViewAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.PreExecuteCommandStack;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.ConfigurableRootEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.IConnectionPreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.IFigurePreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.ILayerPanePreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.INodePreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowEditPartsFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.EditPartMarkerUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowModelManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowResourceFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * This the the main editor page for modifying a complete pageflow.
- */
-public class PageflowEditor extends GraphicalEditorWithFlyoutPalette implements
- IAdaptable, IPropertyChangeListener, IGotoMarker {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(PageflowEditor.class);
-
- /** pageflow context menu registration ID */
- private static final String PAGEFLOW_CONTEXTMENU_REG_ID = ".pageflow.editor.contextmenu";
-
- /** the edit domain */
- private final DefaultEditDomain domain;
-
- /** the palette root */
- private PaletteRoot paletteRoot = null;
-
- /** the parent multi-page editor */
- private IEditorPart parentEditor = null;
-
- /** the graphical viewer */
- private GraphicalViewer viewer = null;
-
- /** the undoable <code>IPropertySheetPage</code> */
- private PropertySheetPage undoablePropertySheetPage = null;
-
- /** the editor's action registry */
- private ActionRegistry actionRegistry = null;
-
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor";
-
- /** the list of action ids that are to EditPart actions */
- private List editPartActionIDs = new ArrayList();
-
- /** the selection listener */
- private ISelectionListener selectionListener = new ISelectionListener() {
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- updateActions();
- }
- };
-
- /** the selection synchronizer for the edit part viewer */
- private SelectionSynchronizer synchronizer = null;
-
- /** the shared key handler */
- private KeyHandler sharedKeyHandler = null;
-
- /** pageflow model manager */
- private PageflowModelManager pageflowManager;
-
- /** the dirty status of this page */
- private boolean isDirty = false;
-
- /** the command stack of this page */
- private CommandStack commandStack;
-
- private FC2PFTransformer modelsTransform;
-
- List stackActions = new ArrayList();
-
- public FC2PFTransformer getModelsTransform() {
- if (modelsTransform == null) {
- modelsTransform = new FC2PFTransformer();
- }
- return modelsTransform;
- }
-
- public void updateActions() {
- updateActions(stackActions);
- updateActions(editPartActionIDs);
- }
-
- /**
- * This class listens for command stack changes of the page and decides if
- * the editor is dirty or not.
- *
- */
- private class PageCommandStackListener implements CommandStackEventListener {
- public void stackChanged(CommandStackEvent event) {
- if (((CommandStack) event.getSource()).isDirty()) {
- // at least one command stack is dirty,
- // so the multi page editor is dirty too
- setDirty(true);
- }
- updateActions();
- }
- }
-
- /**
- * This class listens to changes to the file system in the workspace, and
- * validate the current pageflow based on web files' status.
- */
- private class ResourceTracker implements IResourceChangeListener,
- IResourceDeltaVisitor {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- try {
- if (delta != null) {
- delta.accept(this);
- }
- } catch (CoreException exception) {
- // Pageflow.PageflowEditor.Error.ResourceChange = Failed in the
- // resource change.
- log.error("Pageflow.PageflowEditor.Error.ResourceChange",
- exception);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) {
- // if the delta is not a file instance, just return true
- if (!(delta.getResource() instanceof IFile)) {
- return true;
- }
-
- // web file is changed.
- if (WebrootUtil.isValidWebFile(((IFile) delta.getResource())
- .getFullPath())) {
- webPageChanged(((IFile) delta.getResource()).getFullPath());
- return false;
- }
- return false;
- }
- }
-
- /** the resource tracker instance */
- private ResourceTracker resourceTracker = null;
-
- /**
- * Returns the resource tracker instance
- *
- * @return - Returns the resource tracker instance
- */
- private ResourceTracker getResourceTracker() {
- if (null == resourceTracker) {
- resourceTracker = new ResourceTracker();
- }
- return resourceTracker;
- }
-
- /**
- * Changes the dirty state.
- *
- * @param dirty -
- * dirty state
- */
- protected void setDirty(boolean dirty) {
- if (isDirty != dirty) {
- isDirty = dirty;
- }
- }
-
- /**
- * Updates the specified actions.
- *
- * @param actionIds -
- * the list of ids of actions to update
- */
- protected void updateActions(List actionIds) {
- for (Iterator ids = actionIds.iterator(); ids.hasNext();) {
- IAction action = getActionRegistry().getAction(ids.next());
- if (null != action && action instanceof UpdateAction) {
- ((UpdateAction) action).update();
- }
- }
- }
-
- /**
- * Creates a new PageflowPage instance.
- * <p>
- * By design this page uses its own <code>EditDomain</code>. The main
- * goal of this approach is that this page has its own undo/redo command
- * stack.
- *
- * @param parent -
- * the parent multi page editor
- */
- public PageflowEditor(IEditorPart parent) {
- domain = new DefaultEditDomain(parent);
- domain.setCommandStack(getCommandStack());
- this.setEditDomain(domain);
- parentEditor = parent;
- }
-
- /**
- * Adds an <code>CommandStack</code> action to this editor.
- * <p>
- * <code>CommandStack</code> actions are actions that depend and work on
- * the <code>CommandStack</code>.
- *
- * @param action -
- * the <code>CommandStack</code> action
- */
- protected void addStackAction(StackAction action) {
- getActionRegistry().registerAction(action);
- stackActions.add(action.getId());
- }
-
- /**
- * Creates different kinds of actions and registers them to the
- * ActionRegistry.
- */
- protected void createActions() {
- // register delete action
- addEditPartAction(new DeleteAction((IWorkbenchPart) this));
- // register undo/redo action
- addStackAction(new UndoAction(this));
- addStackAction(new RedoAction(this));
-
- // Allows opening of JSP files from the pageflow
- addEditPartAction(new OpenEditorAction((IWorkbenchPart) this));
-
- // Allows showing property view for the pageflow
- SelectionAction action = new ShowPropertyViewAction(
- (IWorkbenchPart) this);
- action
- .setImageDescriptor(getImageDescriptorForView("org.eclipse.ui.views.PropertySheet"));
- addEditPartAction(action);
- // Allows showing property view for the pageflow
- // addEditPartAction(new ShowPaletteViewAction((IWorkbenchPart) this));
-
- // register alignment actions
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.LEFT));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.RIGHT));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.TOP));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.BOTTOM));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.CENTER));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.MIDDLE));
-
- // register zoom in/out action
- IAction zoomIn = new ZoomInAction(getZoomManager(getGraphicalViewer()));
- IAction zoomOut = new ZoomOutAction(
- getZoomManager(getGraphicalViewer()));
- addAction(zoomIn);
- addAction(zoomOut);
-
- getSite().getKeyBindingService().registerAction(zoomIn);
- getSite().getKeyBindingService().registerAction(zoomOut);
- }
-
- /**
- * Returns the zoom manager of the specified viewer.
- *
- * @param viewer -
- * the viewer to get the zoom manager from
- * @return - the zoom manager
- */
- private ZoomManager getZoomManager(GraphicalViewer viewer) {
- // get zoom manager from root edit part
- RootEditPart rootEditPart = viewer.getRootEditPart();
- ZoomManager zoomManager = null;
- if (rootEditPart instanceof ScalableFreeformRootEditPart) {
- zoomManager = ((ScalableFreeformRootEditPart) rootEditPart)
- .getZoomManager();
- } else if (rootEditPart instanceof ScalableRootEditPart) {
- zoomManager = ((ScalableRootEditPart) rootEditPart)
- .getZoomManager();
- }
- return zoomManager;
- }
-
- /**
- * Adds an action to this editor's <code>ActionRegistry</code>.
- *
- * @param action -
- * the action to add.
- */
- protected void addAction(IAction action) {
- getActionRegistry().registerAction(action);
- }
-
- /**
- * Adds an <code>EditPart</code> action to this editor.
- * <p>
- * <code>EditPart</code> actions are actions that depend and work on the
- * selected <code>EditPart</code>s.
- *
- * @param action -
- * the <code>EditPart</code> action
- */
- protected void addEditPartAction(SelectionAction action) {
- getActionRegistry().registerAction(action);
- editPartActionIDs.add(action.getId());
- }
-
- /**
- * Returns the action registry of this editor.
- *
- * @return - the action registry
- */
- public ActionRegistry getActionRegistry() {
- if (null == actionRegistry) {
- actionRegistry = new ActionRegistry();
- }
-
- return actionRegistry;
- }
-
- /**
- * Creates the GraphicalViewer on the specified <code>Composite</code>.
- *
- * @param parent -
- * the parent composite
- */
- public void createGraphicalViewer(Composite parent) {
- viewer = new ScrollingGraphicalViewer();
- viewer.createControl(parent);
-
- // configure the viewer
- viewer.getControl().setBackground(parent.getBackground());
-
- viewer.setRootEditPart(new ConfigurableRootEditPart());
- // _viewer.setRootEditPart(new ScalableFreeformRootEditPart());
- viewer.setKeyHandler(new GraphicalViewerKeyHandler(viewer));
-
- // hook the viewer into the editor
- registerEditPartViewer(viewer);
-
- // configure the viewer with context menu and template drag and drop
- configureEditPartViewer(viewer);
-
- // initialize the viewer with input
- viewer.setEditPartFactory(new PageflowEditPartsFactory());
- // viewer.setContents(getPageflow());
-
- // support the resource drag&drop
- viewer
- .addDropTargetListener((TransferDropTargetListener) new ResourceTransferDropTargetListener(
- viewer, getParentEditor()) {
- protected CreationFactory getFactory(Object obj) {
- return getResourceFactory((IResource) obj);
- }
- });
-
- // apply Editor's preferences
- // propertyChange(null);
- // add listener to Editor's preferences changing
- EditorPlugin.getDefault().getPreferenceStore()
- .addPropertyChangeListener(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see FlowEditor#getResourceFactory(IResource, ICodeGenEditor)
- */
- protected CreationFactory getResourceFactory(IResource resource) {
- return new PageflowResourceFactory(resource);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
- */
- public final void doSave(IProgressMonitor monitor) {
- // our policy: delegate saving to the parent
- getParentEditor().doSave(monitor);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#doSaveAs()
- */
- public final void doSaveAs() {
- // our policy: delegate saving to the parent
- getParentEditor().doSaveAs();
- }
-
- /**
- * Saves the pageflow under the specified path.
- *
- * @param pageflow
- * @param path
- * workspace relative path
- * @param progressMonitor
- */
- public void doSave(IFile file, IProgressMonitor progressMonitor)
- throws CoreException {
- if (((FileEditorInput) getEditorInput()).getFile() != file) {
- // TODO: save to other page.
- }
- if (null == progressMonitor) {
- progressMonitor = new NullProgressMonitor();
- }
- // Pageflow.Label.Saving = Saving
- progressMonitor.beginTask(PageflowMessages.Pageflow_Label_Saving + " "
- + file.getFullPath(), 2);
-
- if (null == getPageflowManager()) {
- // Pageflow.PageflowEditor.Alert.nullModelManager = No model manager
- // found for saving the file.
- EditorPlugin.getAlerts().throwCoreException(
- "Pageflow.PageflowEditor.Alert.nullModelManager");
- }
-
- // save pageflow to file
- try {
- getPageflowManager().save(getPageflowFilePath(file));
-
- progressMonitor.worked(1);
- file.refreshLocal(IResource.DEPTH_ZERO, new SubProgressMonitor(
- progressMonitor, 1));
- progressMonitor.done();
- setDirty(false);
- } catch (FileNotFoundException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- EditorPlugin.getAlerts().throwCoreException(
- "Pageflow.PageflowEditor.Alert.errorSaveFileInfo");
- } catch (IOException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- EditorPlugin.getAlerts().throwCoreException(
- "Pageflow.PageflowEditor.Alert.errorSaveFileInfo");
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IEditorPart#init(org.eclipse.ui.IEditorSite,
- * org.eclipse.ui.IEditorInput)
- */
- public void init(IEditorSite site, IEditorInput input)
- throws PartInitException {
- setSite(site);
- setInput(input);
- IFile fileFacesConfig = null;
- try {
- fileFacesConfig = ((FileEditorInput) input).getFile();
-
- // load and validate pageflow
- if (null == createPageflow(getPageflowFilePath(fileFacesConfig))) {
- // Pageflow.PageflowEditor.Error.invalidPageflowFile = The
- // specified input is not a valid pageflow.
- log.error("Pageflow.PageflowEditor.Error.invalidPageflowFile");
- throw new PartInitException(
- EditorPlugin
- .getResourceString("Pageflow.PageflowEditor.Error.invalidPageflowFile"));
- }
-
- } catch (CoreException e) {
- // Pageflow.PageflowEditor.Error.invalidPageflowFile = The specified
- // input is not a valid pageflow.
- log.error("Pageflow.PageflowEditor.Error.invalidPageflowFile", e);
- throw new PartInitException(e.getStatus());
- } catch (IOException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- log.error("Pageflow.PageflowEditor.Alert.errorSaveFileInfo", e);
- }
-
- // add selection change listener
- getSite().getWorkbenchWindow().getSelectionService()
- .addSelectionListener(getSelectionListener());
-
- // Add resource change listener
- fileFacesConfig.getWorkspace().addResourceChangeListener(
- getResourceTracker());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- // remove selection change listener
- getModelsTransform().dispose();
- getSite().getWorkbenchWindow().getSelectionService()
- .removeSelectionListener(getSelectionListener());
-
- // remove listener to Editor's preferences changing
- EditorPlugin.getDefault().getPreferenceStore()
- .removePropertyChangeListener(this);
-
- if (getEditorInput() != null) {
- IFile file = (IFile) getEditorInput().getAdapter(IResource.class);
- if (file != null) {
- file.getWorkspace().removeResourceChangeListener(
- getResourceTracker());
- }
- }
- super.dispose();
- }
-
- /**
- * get the pageflow file path based on faces-config.xml file path
- *
- * @return
- */
- private IPath getPageflowFilePath(IFile file) {
- IPath pageflowFilePath;
- pageflowFilePath = PageflowModelManager.makePageflowPath(file
- .getFullPath());
- return pageflowFilePath;
- }
-
- /**
- * Returns the pageflow object from the specified file.
- *
- * @param file -
- * the file resource
- * @return -the pageflow object from the specified file
- * @throws IOException
- */
- private Pageflow createPageflow(IPath pathPageflow) throws CoreException,
- IOException {
- Pageflow pageflow = null;
-
- try {
- getPageflowManager().load(pathPageflow);
- } catch (Exception e) {
- // Pageflow.PageflowEditor.Error.invalidPageflowFile = The specified
- // input is not a valid pageflow.
- // _log.error("Pageflow.PageflowEditor.Error.invalidPageflowFile",
- // e);
- getPageflowManager().createPageflow(pathPageflow);
- }
- IFile fileFacesConfig = ((FileEditorInput) getEditorInput()).getFile();
- // it should update related config file
- if (!fileFacesConfig.getFullPath().toString().trim().equalsIgnoreCase(
- getPageflowManager().getModel().getConfigfile())) {
- getPageflowManager().getModel().setConfigfile(
- fileFacesConfig.getFullPath().toString());
- getPageflowManager().save(pathPageflow);
- }
- pageflow = getPageflowManager().getModel();
- if (null == pageflow) {
- // Pageflow.PageflowEditor.Error.invalidPageflowModel = The model in
- // the pageflow file is not a valid pageflow model.
- log.error("Pageflow.PageflowEditor.Error.invalidPageflowModel");
- EditorPlugin.getAlerts().throwCoreException(
- "Pageflow.PageflowEditor.Error.invalidPageflowModel");
- }
- return pageflow;
- }
-
- /** get the pageflow manager for this page */
- public PageflowModelManager getPageflowManager() {
- if (pageflowManager == null) {
- pageflowManager = new PageflowModelManager();
- }
- return pageflowManager;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#isDirty()
- */
- public final boolean isDirty() {
- return isDirty;
- }
-
- /**
- * Returns the <code>CommandStack</code> of this editor page.
- *
- * @return - the <code>CommandStack</code> of this editor page
- */
- public final CommandStack getCommandStack() {
- if (commandStack == null) {
- commandStack = new PreExecuteCommandStack();
- commandStack
- .addCommandStackEventListener(new PageCommandStackListener());
- }
- return commandStack;
- }
-
- /**
- * Returns the default <code>PaletteRoot</code> for this editor and all
- * its pages.
- *
- * @return - the default <code>PaletteRoot</code>
- */
- protected PaletteRoot getPaletteRoot() {
- if (null == paletteRoot) {
- // create root
- paletteRoot = new PageflowPaletteRoot();
- }
- return paletteRoot;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#isSaveAsAllowed()
- */
- public final boolean isSaveAsAllowed() {
- // our policy: delegate saving to the parent
- return getParentEditor().isSaveAsAllowed();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- getGraphicalViewer().getControl().setFocus();
- }
-
- /**
- * Returns the multi page pageflow editor this editor page is contained in.
- *
- * @return - the parent multi page editor
- */
- protected final IEditorPart getParentEditor() {
- return parentEditor;
- }
-
- /**
- * Returns the edit domain this editor page uses.
- *
- * @return - the edit domain this editor page uses
- */
- public final DefaultEditDomain getEditDomain() {
- return domain;
- }
-
- /**
- * Hooks a <code>EditPartViewer</code> to the rest of the Editor.
- * <p>
- * By default, the viewer is added to the SelectionSynchronizer, which can
- * be used to keep 2 or more EditPartViewers in sync. The viewer is also
- * registered as the ISelectionProvider for the Editor's PartSite.
- *
- * @param viewer -
- * the viewer to hook into the editor
- */
- protected void registerEditPartViewer(EditPartViewer viewer) {
- // register viewer to edit domain
- getEditDomain().addViewer(viewer);
-
- // the multi page pageflow editor keeps track of synchronizing
- getSelectionSynchronizer().addViewer(viewer);
-
- // add viewer as selection provider
- getSite().setSelectionProvider(viewer);
- }
-
- /**
- * Configures the specified <code>EditPartViewer</code> including context
- * menu, key handler, etc.
- *
- * @param viewer -
- * the pageflow graphical viewer.
- */
- protected void configureEditPartViewer(EditPartViewer viewer) {
- // configure the shared key handler
- if (null != viewer.getKeyHandler()) {
- viewer.getKeyHandler().setParent(getSharedKeyHandler());
- }
- // create the ActionRegistry
- createActions();
-
- // append the parent editor's action registry.
- ActionRegistry actionRegistry = (ActionRegistry) getParentEditor()
- .getAdapter(ActionRegistry.class);
- if (actionRegistry != null) {
- for (Iterator iter = actionRegistry.getActions(); iter.hasNext();) {
- getActionRegistry().registerAction((IAction) iter.next());
- }
- }
- // configure and register the context menu
- ContextMenuProvider provider = new PageflowEditorContextMenuProvider(
- viewer, getActionRegistry());
- viewer.setContextMenu(provider);
- getSite().registerContextMenu(
- EditorPlugin.getPluginId() + PAGEFLOW_CONTEXTMENU_REG_ID,
- provider, getSite().getSelectionProvider()); //$NON-NLS-1$
-
- // enable viewer as drop target for template transfers
- viewer
- .addDropTargetListener((TransferDropTargetListener) new PageflowTemplateTransferDropTargetListener(
- viewer));
-
- }
-
- /**
- * Returns the pageflow that is edited.
- *
- * @return - the pageflow that is edited
- */
- public Pageflow getPageflow() {
- return getPageflowManager().getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditorPage#getGraphicalViewerForZoomSupport()
- */
- public GraphicalViewer getGraphicalViewer() {
- return viewer;
- }
-
- public void setGraphicalViewerContents(Object contents) {
- viewer.setContents(contents);
- propertyChange(null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class type) {
- if (type == IContentOutlinePage.class) {
- return getOutlinePage();
- } else if (type == CommandStack.class) {
- return getCommandStack();
- } else if (type == ActionRegistry.class) {
- return getActionRegistry();
- } else if (type == IPropertySheetPage.class) {
- return getPropertySheetPage();
- } else if (type == ZoomManager.class) {
- return getZoomManager(getGraphicalViewer());
- }
- return super.getAdapter(type);
- }
-
- /**
- * Returns the outline page for the outline view with lazy creation
- *
- * @return - the outline page
- */
- protected PageflowEditorOutlinePage getOutlinePage() {
- PageflowEditorOutlinePage outlinePage = new PageflowEditorOutlinePage(
- this);
- outlinePage.initialize(this);
- return outlinePage;
- }
-
- /**
- * Returns the undoable <code>PropertySheetPage</code> for this editor.
- *
- * @return - the undoable <code>PropertySheetPage</code>
- */
- protected IPropertySheetPage getPropertySheetPage() {
- if (null == undoablePropertySheetPage) {
- undoablePropertySheetPage = new PropertySheetPage();
-
- /** set the property source for property sheet page */
- undoablePropertySheetPage
- .setRootEntry(new org.eclipse.gef.ui.properties.UndoablePropertySheetEntry(
- (CommandStack) getAdapter(CommandStack.class)));
-
- }
-
- return undoablePropertySheetPage;
- }
-
- /**
- * Returns the selection syncronizer object. The synchronizer can be used to
- * sync the selection of 2 or more EditPartViewers.
- *
- * @return - the syncrhonizer
- */
- protected SelectionSynchronizer getSelectionSynchronizer() {
- if (null == synchronizer) {
- synchronizer = new SelectionSynchronizer();
- }
- return synchronizer;
- }
-
- /**
- * Returns the shared KeyHandler that should be used for all viewers.
- *
- * @return - the shared KeyHandler
- */
- protected KeyHandler getSharedKeyHandler() {
- if (null == sharedKeyHandler) {
- sharedKeyHandler = new KeyHandler();
-
- // configure common keys for all viewers
- sharedKeyHandler
- .put(KeyStroke.getPressed(SWT.DEL, 127, 0),
- getActionRegistry().getAction(
- ActionFactory.DELETE.getId()));
- sharedKeyHandler.put(KeyStroke.getPressed(SWT.F2, 0),
- getActionRegistry().getAction(
- GEFActionConstants.DIRECT_EDIT));
- }
- return sharedKeyHandler;
- }
-
- /**
- * Returns the selection listener.
- *
- * @return - the <code>ISelectionListener</code>
- */
- protected ISelectionListener getSelectionListener() {
- return selectionListener;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- String property = (event == null) ? null : event.getProperty();
-
- propagateProperty(property, viewer.getRootEditPart());
- }
-
- /**
- * propagate property change to children edit part
- *
- * @param property -
- * property's string name
- * @param part -
- * parent edit part.
- */
- private void propagateProperty(String property, EditPart part) {
- processPropertyChange(property, part);
-
- if (part instanceof GraphicalEditPart) {
- // get the connections edit part
- Iterator iterConns = ((GraphicalEditPart) part)
- .getSourceConnections().iterator();
- while (iterConns.hasNext()) {
- EditPart child = (EditPart) iterConns.next();
- propagateProperty(property, child);
- }
- }
- Iterator iter = part.getChildren().iterator();
- while (iter.hasNext()) {
- EditPart child = (EditPart) iter.next();
- propagateProperty(property, child);
- }
- }
-
- /**
- * process the property change FIXME: The property change should be category
- * to improve the performance.
- *
- * @param property -
- * property's string name
- * @param part-EditPart
- */
- private void processPropertyChange(String property, EditPart part) {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
-
- if (property != null
- && property.equals(GEMPreferences.USE_SYSTEM_COLORS)) {
- // reload all properties - it's easiest
- property = null;
- }
-
- if (property == null || GEMPreferences.SNAP_TO_GRID.equals(property)) {
- boolean bSnapToGrid = store.getBoolean(GEMPreferences.SNAP_TO_GRID);
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part).setGridVisible(bSnapToGrid);
- }
- }
-
- if (property == null || GEMPreferences.GRID_WIDTH.equals(property)
- || GEMPreferences.GRID_HEIGHT.equals(property)) {
- Dimension gridSpacing = new Dimension(store
- .getInt(GEMPreferences.GRID_WIDTH), store
- .getInt(GEMPreferences.GRID_HEIGHT));
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part).setGridSpacing(gridSpacing);
- }
- }
-
- if (property == null || GEMPreferences.GRID_COLOR.equals(property)) {
- Color gridFgColor = GEMPreferences.getColor(store,
- GEMPreferences.GRID_COLOR);
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part)
- .setGridForegroundColor(gridFgColor);
- }
- }
-
- if (property == null || GEMPreferences.CANVAS_COLOR.equals(property)) {
- Color containerBgColor = GEMPreferences.getColor(store,
- GEMPreferences.CANVAS_COLOR);
- if (part instanceof IFigurePreference) {
- ((IFigurePreference) part).setBackgroundColor(containerBgColor);
- }
- }
-
- if (property == null || GEMPreferences.LINE_WIDTH.equals(property)) {
- int linkLineWidth = store.getInt(GEMPreferences.LINE_WIDTH);
-
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part).setLineWidth(linkLineWidth);
- }
- }
-
- if (property == null || GEMPreferences.LINE_COLOR.equals(property)) {
- Color linkLineColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_COLOR);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part)
- .setForegroundColor(linkLineColor);
- }
- }
-
- if (property == null
- || GEMPreferences.SHOW_LINE_LABELS.equals(property)) {
- boolean bLinkLabelVisible = store
- .getBoolean(GEMPreferences.SHOW_LINE_LABELS);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part)
- .setLabelVisible(bLinkLabelVisible);
- }
- }
-
- if (property == null || GEMPreferences.LINE_LABEL_FONT.equals(property)
- || GEMPreferences.LINE_LABEL_FONT_COLOR.equals(property)) {
- Font linkLabelFont = new Font(null, PreferenceConverter
- .getFontData(store, GEMPreferences.LINE_LABEL_FONT));
- Color linkLabelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_FONT_COLOR);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part).setFont(linkLabelFont);
- ((IConnectionPreference) part)
- .setLabelForegroundColor(linkLabelFgColor);
- }
- }
-
- if (property == null
- || GEMPreferences.LINE_LABEL_COLOR.equals(property)) {
- Color linkLabelBgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_COLOR);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part)
- .setLabelBackgroundColor(linkLabelBgColor);
- }
- }
-
- if (property == null || GEMPreferences.LINE_ROUTING.equals(property)) {
- String connectionStyle = store
- .getString(GEMPreferences.LINE_ROUTING);
- int style;
- if (GEMPreferences.LINE_ROUTING_MANHATTAN.equals(connectionStyle)) {
- style = ILayerPanePreference.LINE_ROUTING_MANHATTAN;
- } else {
- style = ILayerPanePreference.LINE_ROUTING_MANUAL;
- }
-
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part).setConnectionRouterStyle(style);
- } else if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part).setConnectionRouterStyle(style);
- }
- }
-
- if (property == null
- || GEMPreferences.FIGURE_LABEL_FONT.equals(property)
- || GEMPreferences.FIGURE_LABEL_FONT_COLOR.equals(property)) {
- Font nodeLabelFont = new Font(null, PreferenceConverter
- .getFontData(store, GEMPreferences.FIGURE_LABEL_FONT));
- Color nodeLabelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.FIGURE_LABEL_FONT_COLOR);
-
- if (part instanceof INodePreference) {
- ((INodePreference) part).setFont(nodeLabelFont);
- ((INodePreference) part).setForegroundColor(nodeLabelFgColor);
- }
- }
-
- if (property == null || GEMPreferences.LABEL_PLACEMENT.equals(property)) {
- int placement = PositionConstants.SOUTH;
- String nodeLabelPlacement = store
- .getString(GEMPreferences.LABEL_PLACEMENT);
- if (GEMPreferences.LABEL_PLACEMENT_TOP.equals(nodeLabelPlacement))
- placement = PositionConstants.NORTH;
- if (GEMPreferences.LABEL_PLACEMENT_BOTTOM
- .equals(nodeLabelPlacement))
- placement = PositionConstants.SOUTH;
- if (GEMPreferences.LABEL_PLACEMENT_LEFT.equals(nodeLabelPlacement))
- placement = PositionConstants.WEST;
- if (GEMPreferences.LABEL_PLACEMENT_RIGHT.equals(nodeLabelPlacement))
- placement = PositionConstants.EAST;
-
- if (part instanceof INodePreference) {
- ((INodePreference) part).setTextPlacement(placement);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.ide.IGotoMarker#gotoMarker(org.eclipse.core.resources.IMarker)
- */
- public void gotoMarker(IMarker marker) {
- // The LOCATION attribute in the marker should be the ID string
- Object id = null;
- try {
- id = marker.getAttribute(IMarker.LOCATION);
- } catch (CoreException e) {
- // Pageflow.PageflowEditor.Error.invalidMarkerAttribute = Unable to
- // get marker's attribute
- log
- .error(
- "Pageflow.PageflowEditor.Error.invalidMarkerAttribute",
- e);
- }
- if (id instanceof String) {
- GraphicalEditPart part = EditPartMarkerUtil.findEditPart(
- (GraphicalEditPart) getGraphicalViewer().getRootEditPart(),
- (String) id);
- if (part != null) {
- getGraphicalViewer().reveal(part);
- getGraphicalViewer().select(part);
- return;
- }
- }
-
- }
-
- /**
- * the related web page is changed in outside editor, the pageflow should be
- * revalidated to update the validation icons
- *
- * @param fullPath
- */
- public void webPageChanged(IPath fullPath) {
- PageflowPage page = getPageflowManager().foundPage(
- WebrootUtil.getWebPath(fullPath));
-
- if (page != null && getGraphicalViewer() != null
- && getGraphicalViewer().getRootEditPart() != null) {
- GraphicalEditPart pagePart = EditPartMarkerUtil.findEditPart(
- (GraphicalEditPart) getGraphicalViewer().getRootEditPart(),
- page.getId());
- PageflowAnnotationUtil
- .validatePage((PageflowNodeEditPart) pagePart);
- }
- }
-
- /**
- * Get the image desriptor from the view's id.
- *
- * @param viewid
- * @return
- */
- private ImageDescriptor getImageDescriptorForView(String viewid) {
- IConfigurationElement[] elements = Platform.getExtensionRegistry()
- .getConfigurationElementsFor("org.eclipse.ui.views");
- for (int i = 0; i < elements.length; i++) {
- String name = elements[i].getName();
- String id = elements[i].getAttribute("id");
- if ("view".equals(name) && viewid.equals(id)) {
- String iconPath = elements[i].getAttribute("icon");
- if (iconPath != null) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(
- elements[i].getDeclaringExtension().getNamespace(),
- iconPath);
- }
- }
- }
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java
deleted file mode 100644
index 5fe56d457..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.ShowPropertyViewAction;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * This is the context menu provider for pageflow editor.
- *
- */
-public class PageflowEditorContextMenuProvider extends ContextMenuProvider {
- /** the action registry */
- private final ActionRegistry actionRegistry;
-
- /**
- * Creates a new PageflowEditorContextMenuProvider instance.
- *
- * @param viewer -
- * the editor viewer
- * @param actionRegistry -
- * action registry of the editor
- */
- public PageflowEditorContextMenuProvider(EditPartViewer viewer,
- ActionRegistry actionRegistry) {
- super(viewer);
-
- this.actionRegistry = actionRegistry;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ContextMenuProvider#buildContextMenu(IMenuManager)
- */
- public void buildContextMenu(IMenuManager menuManager) {
- // add GEF menu groups, such as undo, edit, save, etc.
- GEFActionConstants.addStandardActionGroups(menuManager);
-
- // add typical undo/redo commands
- appendActionToUndoGroup(menuManager, ActionFactory.UNDO.getId());
- appendActionToUndoGroup(menuManager, ActionFactory.REDO.getId());
- // add edit commands, including copy, paste, delete
- appendActionToEditGroup(menuManager, ActionFactory.COPY.getId());
- appendActionToEditGroup(menuManager, ActionFactory.PASTE.getId());
- appendActionToEditGroup(menuManager, ActionFactory.DELETE.getId());
- // Add Open Editor Action
- appendActionToEditGroup(menuManager, FacesConfigEditor.EDITOR_ID);
-
- // append the save submenu
- appendActionToSaveGroup(menuManager, ActionFactory.SAVE.getId());
-
- // append the alignment submenu, including top, bottom, middle, left,
- // right and center.
- appendAlignmentSubmenu(menuManager);
-
- appendShowViewSubmenu(menuManager);
-
- }
-
- /**
- * Appends the alignment subment.
- *
- * @param menuManager-menu
- * manager of workbench
- */
- private void appendShowViewSubmenu(IMenuManager menuManager) {
- // Show View Actions
- MenuManager submenu = new MenuManager(
- PageflowMessages.Pageflow_Contextmenu_ShowView_Label);
-
- IAction action = getActionRegistry().getAction(
- ShowPropertyViewAction.SHOW_PROPERTY_VIEW);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- // action = getActionRegistry().getAction(
- // ShowPaletteViewAction.SHOW_PALETTE_VIEW);
- // if (null != action && action.isEnabled()) {
- // submenu.add(action);
- // }
-
- if (!submenu.isEmpty()) {
- menuManager.appendToGroup(GEFActionConstants.GROUP_REST, submenu);
- }
- }
-
- /**
- * Appends the alignment subment.
- *
- * @param menuManager-menu
- * manager of workbench
- */
- private void appendAlignmentSubmenu(IMenuManager menuManager) {
- // Alignment Actions
- MenuManager submenu = new MenuManager(
- PageflowMessages.Pageflow_Contextmenu_Align_Label);
-
- IAction action = getActionRegistry().getAction(
- GEFActionConstants.ALIGN_LEFT);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_CENTER);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_RIGHT);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_TOP);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_MIDDLE);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_BOTTOM);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- if (!submenu.isEmpty()) {
- menuManager.appendToGroup(GEFActionConstants.GROUP_EDIT, submenu);
- }
- }
-
- /**
- * Returns the action registry.
- *
- * @return - the action registry
- */
- protected ActionRegistry getActionRegistry() {
- return actionRegistry;
- }
-
- /**
- * Appends the specified action to the specified menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- * @param menuGroup -
- * menu group name
- */
- private void appendActionToMenu(IMenuManager menu, String actionId,
- String menuGroup) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(menuGroup, action);
- }
- }
-
- /**
- * Appends the specified action to the 'Undo' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToUndoGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action);
- }
- }
-
- /**
- * Appends the specified action to the 'edit' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToEditGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action);
- }
- }
-
- /**
- * Appends the specified action to the 'add' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToAddGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_ADD, action);
- }
- }
-
- /**
- * Appends the specified action to the 'save' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToSaveGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_SAVE, action);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java
deleted file mode 100644
index cda845c92..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LightweightSystem;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.parts.ScrollableThumbnail;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.ui.parts.TreeViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowTreePartFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * This is an implementation of an outline page showing an overview figure and
- * an tree outline of the main graphical viewer provided by the current active
- * page of an multi page editor.
- *
- */
-public class PageflowEditorOutlinePage extends Page implements
- IContentOutlinePage {
- /** the pageflow editor */
- private final PageflowEditor editor;
-
- /** the outlineContent for the tree viewer */
- private PageflowElement outlineContent = null;
-
- /** the control of the overview */
- private Canvas overview = null;
-
- /** the root edit part (outlineContent for the thumbnail) */
- private RootEditPart overviewContent = null;
-
- /** the thumbnail */
- private ScrollableThumbnail thumbnail = null;
-
- /** the tree viewer */
- private TreeViewer treeViewer = null;
-
- /** the control of the tree view */
- private Control outline = null;
-
- /** the pagebook */
- private PageBook pageBook = null;
-
- /** action for showing the tree page */
- private IAction showOutlineAction = null;
-
- /** action for showing the overview page */
- private IAction showOverviewAction = null;
-
- /** the LightweightSystem */
- private LightweightSystem lws = null;
-
- /** the edit domain */
- private EditDomain editDomain = null;
-
- /**
- * Creates a new PageflowEditorOutlinePage instance.
- *
- * @param editor -
- * Pageflow Editor
- */
- public PageflowEditorOutlinePage(EditorPart editor) {
- super();
- this.editor = (PageflowEditor) editor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- getTreeViewer().addSelectionChangedListener(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#createControl(Composite)
- */
- public void createControl(Composite parent) {
- // pagebook
- pageBook = new PageBook(parent, SWT.NONE);
-
- // tree viewer control
- outline = getTreeViewer().createControl(pageBook);
- configureEditPartViewer(getTreeViewer());
-
- // overview canvas
- overview = new Canvas(pageBook, SWT.NONE);
- lws = new LightweightSystem(overview);
-
- // create actions
- IToolBarManager tbm = getSite().getActionBars().getToolBarManager();
- showOutlineAction = new Action() {
- public void run() {
- showPage(outline);
- }
- };
- showOutlineAction.setImageDescriptor(EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Outline.gif")); //$NON-NLS-1$
- tbm.add(showOutlineAction);
- showOverviewAction = new Action() {
- public void run() {
- showPage(overview);
- }
- };
- showOverviewAction.setImageDescriptor(EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Outline_Overview.gif")); //$NON-NLS-1$
- tbm.add(showOverviewAction);
-
- // initialize outline page
- initializeOutlineViewer();
-
- // initialize overview
- initializeOverview();
-
- // initialize pagebook
- showPage(outline);
- }
-
- /**
- * Configures the outline viewer
- */
- private void initializeOutlineViewer() {
- if (null != getEditDomain()) {
- getEditDomain().addViewer(getTreeViewer());
- }
- // getTreeViewer().setEditPartFactory(new PageflowTreePartFactory());
-
- // synchronize selections
- editor.getSelectionSynchronizer().addViewer(getTreeViewer());
-
- // add content
- getTreeViewer().setContents(getOutlineContent());
- }
-
- /**
- * Shows the spcified page.
- *
- * @param id -
- * control id of pagebook in outline page. it is can be _outline
- * or _overview
- */
- protected void showPage(Control id) {
- if (id == outline) {
- showOutlineAction.setChecked(true);
- showOverviewAction.setChecked(false);
- pageBook.showPage(outline);
- if (thumbnail != null) {
- thumbnail.setVisible(false);
- }
- } else if (id == overview) {
- showOutlineAction.setChecked(false);
- showOverviewAction.setChecked(true);
- pageBook.showPage(overview);
- if (thumbnail != null) {
- thumbnail.setVisible(true);
- }
- }
- }
-
- /**
- * Returns the current edit domain.
- *
- * @return - the edit domain
- */
- public EditDomain getEditDomain() {
- return editDomain;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#dispose()
- */
- public void dispose() {
- editor.getSelectionSynchronizer().removeViewer(getTreeViewer());
-
- if (null != thumbnail) {
- thumbnail.deactivate();
- }
-
- super.dispose();
- }
-
- /**
- * initialize Overview.
- *
- * @return - the edit domain
- */
- private void initializeOverview() {
- // check if control was created
- if (null == lws) {
- return;
- }
-
- // deactivate old thumbnail
- if (null != thumbnail) {
- thumbnail.deactivate();
- }
-
- // create empty thumbnail
- thumbnail = new ScrollableThumbnail();
- thumbnail.setBorder(new MarginBorder(3));
- lws.setContents(thumbnail);
-
- // initialize thumbnail
- if (null != getOverviewContent()) {
- Viewport viewport = null;
- IFigure source = null;
- if (getOverviewContent() instanceof ScalableFreeformRootEditPart) {
- viewport = (Viewport) ((ScalableFreeformRootEditPart) getOverviewContent())
- .getFigure();
- source = ((ScalableFreeformRootEditPart) getOverviewContent())
- .getLayer(LayerConstants.PRINTABLE_LAYERS);
- }
- if (getOverviewContent() instanceof ScalableRootEditPart) {
- viewport = (Viewport) ((ScalableRootEditPart) getOverviewContent())
- .getFigure();
- source = ((ScalableRootEditPart) getOverviewContent())
- .getLayer(LayerConstants.PRINTABLE_LAYERS);
- }
-
- if (null != viewport && null != source) {
- thumbnail.setViewport(viewport);
- thumbnail.setSource(source);
- }
- }
- }
-
- /**
- * Returns the outlineContent.
- *
- * @return - the outlineContent
- */
- public PageflowElement getOutlineContent() {
- return outlineContent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#getControl()
- */
- public Control getControl() {
- return pageBook;
- }
-
- /**
- * Returns the root edit part
- *
- * @return - the root edit part
- */
- public RootEditPart getOverviewContent() {
- return overviewContent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return getTreeViewer().getSelection();
- }
-
- /**
- * Returns the tree viewer.
- *
- * @return - the tree viewer
- */
- public TreeViewer getTreeViewer() {
- if (null == treeViewer) {
- treeViewer = new TreeViewer();
- treeViewer.setEditPartFactory(new PageflowTreePartFactory());
- }
-
- return treeViewer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- getTreeViewer().removeSelectionChangedListener(listener);
- }
-
- /**
- * Sets the outlineContent.
- *
- * @param element -
- * Pageflow Element
- */
- public void setOutlineContent(PageflowElement element) {
- if (outlineContent != element) {
- outlineContent = element;
-
- // refresh viewer
- if (null != getTreeViewer().getControl()) {
- getTreeViewer().setContents(element);
-
- // bugfix: something is overwriting visibility
- if (null != pageBook) {
- if (showOverviewAction.isChecked()) {
- showPage(outline);
- showPage(overview);
- } else {
- showPage(outline);
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#setFocus()
- */
- public void setFocus() {
- if (getControl() != null) {
- getControl().setFocus();
- }
- }
-
- /**
- * Sets the root edit part.
- *
- * @param part -
- * root edit part for pageflow model
- */
- public void setOverviewContent(RootEditPart part) {
- if (overviewContent != part) {
- overviewContent = part;
- // reinitialize thumbnail
- // if (null != thumbnail && thumbnail.isVisible())
- initializeOverview();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#setSelection(ISelection)
- */
- public void setSelection(ISelection selection) {
- getTreeViewer().setSelection(selection);
- }
-
- /**
- * Initializes this outline page from a given editor page.
- *
- * @param newPage -
- * Pageflow EditorPage
- */
- public void initialize(PageflowEditor newPage) {
- if (null != newPage.getGraphicalViewer()) {
- setOverviewContent(newPage.getGraphicalViewer().getRootEditPart());
- EditPart currentContent = newPage.getGraphicalViewer()
- .getContents();
- setOutlineContent(null != currentContent ? (PageflowElement) currentContent
- .getModel()
- : null);
- setEditDomain(newPage.getEditDomain());
- getViewerContentListener().setViewer(newPage.getGraphicalViewer());
- } else {
- setOverviewContent(null);
- setOutlineContent(null);
- setEditDomain(null);
- }
- }
-
- /**
- * Sets the edit domain.
- *
- * @param domain -
- * editor's edit domain
- */
- public void setEditDomain(EditDomain domain) {
- if (editDomain != domain) {
- // refresh viewer
- if (null != getTreeViewer()) {
- if (null != editDomain) {
- editDomain.removeViewer(getTreeViewer());
- }
- if (null != domain) {
- domain.addViewer(getTreeViewer());
- }
- }
- editDomain = domain;
- }
- }
-
- /**
- * the current viewer content listener
- */
- private final ViewerContentListener viewerContentListener = new ViewerContentListener();
-
- /**
- * This class listens for changes of the content of an EditPartViewer. If
- * the content changed, it will update the outline viewer.
- * <p>
- * Important: this class has to be disposed with
- * <code>setViewer(null)</code>.
- *
- * @author Gunnar Wagenknecht
- */
- private class ViewerContentListener implements EditPartListener {
- /* the viewer */
- private EditPartViewer _viewer;
-
- /**
- * Sets a new viewer. <code>null</code> is allowed to dispose.
- *
- * @param viewer
- */
- public void setViewer(EditPartViewer viewer) {
- if (null != this._viewer)
- this._viewer.getRootEditPart().removeEditPartListener(this);
-
- this._viewer = viewer;
-
- if (null != this._viewer)
- this._viewer.getRootEditPart().addEditPartListener(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#childAdded(org.eclipse.gef.EditPart,
- * int)
- */
- public void childAdded(EditPart child, int index) {
- // this is out event, update the viewers
- if (child.getModel() instanceof PageflowElement)
- setOutlineContent((PageflowElement) child.getModel());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#partActivated(org.eclipse.gef.EditPart)
- */
- public void partActivated(EditPart editpart) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#partDeactivated(org.eclipse.gef.EditPart)
- */
- public void partDeactivated(EditPart editpart) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#removingChild(org.eclipse.gef.EditPart,
- * int)
- */
- public void removingChild(EditPart child, int index) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#selectedStateChanged(org.eclipse.gef.EditPart)
- */
- public void selectedStateChanged(EditPart editpart) {
- }
- }
-
- /**
- * Returns the viewer content listener.
- *
- * @return the viewer content listener
- */
- private ViewerContentListener getViewerContentListener() {
- return viewerContentListener;
- }
-
- /**
- * Configures the specified <code>EditPartViewer</code>.
- *
- * @param viewer
- */
- protected void configureEditPartViewer(EditPartViewer viewer) {
- // configure the shared key handler
- if (viewer.getKeyHandler() != null) {
- viewer.getKeyHandler().setParent(editor.getSharedKeyHandler());
- }
-
- // configure the context menu
- ContextMenuProvider provider = new PageflowEditorContextMenuProvider(
- viewer, editor.getActionRegistry());
- viewer.setContextMenu(provider);
- getSite().registerContextMenu(
- EditorPlugin.getPluginId()
- + ".pageflow.editor.outlineview.contextmenu", provider,
- getSite().getSelectionProvider()); //$NON-NLS-1$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
deleted file mode 100644
index f2cd5172e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class PageflowMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages";
-
- private PageflowMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, PageflowMessages.class);
- }
-
- public static String Pageflow_Label_True;
-
- public static String Pageflow_Label_False;
-
- public static String Pageflow_Label_Saving;
-
- public static String Pageflow_Dialog_Label_CreateFileTitle;
-
- public static String Pageflow_Dialog_Label_FileNotExistedPart1;
-
- public static String Pageflow_Dialog_Label_FileNotExistedPart2;
-
- public static String Pageflow_Action_OpenEditor_Label;
-
- public static String Pageflow_Action_OpenEditor_ToolTip;
-
- public static String Pageflow_Action_ShowPropertyView_Label;
-
- public static String Pageflow_Action_ShowPropertyView_ToolTip;
-
- public static String Pageflow_Action_ShowPaletteView_Label;
-
- public static String Pageflow_Action_ShowPaletteView_ToolTip;
-
- public static String Pageflow_Action_SyncWithFacesConfig_Label;
-
- public static String Pageflow_Action_SyncWithFacesConfig_ToolTip;
-
- public static String Pageflow_Action_UpdateFacesConfig_Label;
-
- public static String Pageflow_Action_UpdateFacesConfig_ToolTip;
-
- public static String Pageflow_PaletteTool_Group_Controls;
-
- public static String Pageflow_PaletteTool_Select_Label;
-
- public static String Pageflow_PaletteTool_Select_Description;
-
- public static String Pageflow_PaletteTool_Marquee_Label;
-
- public static String Pageflow_PaletteTool_Marquee_Description;
-
- public static String Pageflow_PaletteTool_Link_Label;
-
- public static String Pageflow_PaletteTool_Link_Description;
-
- public static String Pageflow_PaletteTool_Group_Nodes;
-
- public static String Pageflow_PaletteTool_Begin_Label;
-
- public static String Pageflow_PaletteTool_Begin_Description;
-
- public static String Pageflow_PaletteTool_End_Label;
-
- public static String Pageflow_PaletteTool_End_Description;
-
- public static String Pageflow_PaletteTool_Action_Label;
-
- public static String Pageflow_PaletteTool_Action_Description;
-
- public static String Pageflow_PaletteTool_Page_Label;
-
- public static String Pageflow_PaletteTool_Page_Description;
-
- public static String Pageflow_Contextmenu_Align_Label;
-
- public static String Pageflow_Contextmenu_ShowView_Label;
-
- public static String Pageflow_Commands_AddNodeCommand_Label;
-
- public static String Pageflow_Commands_CreateNodeCommand_Label;
-
- public static String Pageflow_Commands_DeleteNodeCommand_Label;
-
- public static String Pageflow_Commands_ConnectionCommand_Label;
-
- public static String Pageflow_Commands_CreateBendpointCommand_Label;
-
- public static String Pageflow_Commands_MoveBendpointCommand_Label;
-
- public static String Pageflow_Commands_DeleteBendpointCommand_Label;
-
- public static String Pageflow_Commands_OpenEditorCommand_Label;
-
- public static String Pageflow_Commands_OrphanChildCommand_Label;
-
- public static String Pageflow_Commands_UpdatePageflowCommand_Label;
-
- public static String Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Title;
-
- public static String Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Description;
-
- public static String Pageflow_Model_Attributes_comment;
-
- public static String Pageflow_Model_Attributes_name;
-
- public static String Pageflow_Model_Attributes_largeicon;
-
- public static String Pageflow_Model_Attributes_smallicon;
-
- public static String Pageflow_Model_Attributes_action;
-
- public static String Pageflow_Model_Attributes_path;
-
- public static String Pageflow_Model_Attributes_begin;
-
- public static String Pageflow_Model_Attributes_end;
-
- public static String Pageflow_Model_Attributes_configfile;
-
- public static String Pageflow_Model_Attributes_source;
-
- public static String Pageflow_Model_Attributes_target;
-
- public static String Pageflow_Model_Attributes_outcome;
-
- public static String Pageflow_Model_Attributes_redirect;
-
- public static String Pageflow_Model_Attributes_fromaction;
-
- public static String Pageflow_Model_Attributes_referenceLink;
-
- public static String Pageflow_Model_Items_Pageflow;
-
- public static String Pageflow_Model_Items_PFPage;
-
- public static String Pageflow_Model_Items_PFLink;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_Choice;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_Title;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_JSPName;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Title;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Component;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action;
-
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_Outcome;
-
- public static String Pageflow_Validation_UndefinedOutcome;
-
- public static String Pageflow_Validation_NotExistedSourcePage;
-
- public static String Pageflow_Validation_MissingSourcePage;
-
- public static String Pageflow_Validation_InvalidWebPage;
-
- public static String Pageflow_Validation_NotExitedWebPage;
-
- public static String Pageflow_Validation_MissingWebPage;
-
- public static String Pageflow_Validation_MissingManagedBean;
-
- public static String Pageflow_Validation_MissingAction;
-
- public static String ExistingPagePathDialogCellEdito_LabelText;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
deleted file mode 100644
index e4509f8ff..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-####################################################
-# Generic Strings for UI
-####################################################
-Pageflow_Label_True=true
-Pageflow_Label_False=false
-
-Pageflow_Label_Saving=Saving
-
-Pageflow_Dialog_Label_CreateFileTitle=Create File
-Pageflow_Dialog_Label_FileNotExistedPart1=The file
-Pageflow_Dialog_Label_FileNotExistedPart2=doesn't exist. Click OK to create it.
-
-####################################################
-# Generic Strings for Action and PaletteTool
-####################################################
-Pageflow_Action_OpenEditor_Label=Open
-Pageflow_Action_OpenEditor_ToolTip=Open Page or Action component
-
-Pageflow_Action_ShowPropertyView_Label=Properties
-Pageflow_Action_ShowPropertyView_ToolTip=Show Properties View
-
-Pageflow_Action_ShowPaletteView_Label=Palette
-Pageflow_Action_ShowPaletteView_ToolTip=Show Palette View
-
-Pageflow_Action_SyncWithFacesConfig_Label=Synchronize with Faces-config
-Pageflow_Action_SyncWithFacesConfig_ToolTip=Synchronizing PageFlow Model with Faces-config
-
-Pageflow_Action_UpdateFacesConfig_Label=Update Faces-config
-Pageflow_Action_UpdateFacesConfig_ToolTip=Update Faces-config File from The Current PageFlow
-
-Pageflow_PaletteTool_Group_Controls=Controls
-
-Pageflow_PaletteTool_Select_Label=Select
-Pageflow_PaletteTool_Select_Description=Select One or More Items
-
-Pageflow_PaletteTool_Marquee_Label=Marquee
-Pageflow_PaletteTool_Marquee_Description=Marquee One or More Items
-
-Pageflow_PaletteTool_Link_Label=Link
-Pageflow_PaletteTool_Link_Description=Creates a Link
-
-Pageflow_PaletteTool_Group_Nodes=Nodes
-
-Pageflow_PaletteTool_Begin_Label=Begin
-Pageflow_PaletteTool_Begin_Description=Creates a PageFlow Begin
-
-Pageflow_PaletteTool_End_Label=End
-Pageflow_PaletteTool_End_Description=Creates a PageFlow End
-
-Pageflow_PaletteTool_Action_Label=Action
-Pageflow_PaletteTool_Action_Description=Creates a PageFlow Action
-
-Pageflow_PaletteTool_Page_Label=Page
-Pageflow_PaletteTool_Page_Description=Creates a PageFlow Page
-
-Pageflow_Contextmenu_Align_Label=Align
-
-Pageflow_Contextmenu_ShowView_Label=Show View
-
-
-
-####################################################
-# Generic Strings for Commands
-####################################################
-Pageflow_Commands_AddNodeCommand_Label=Add
-Pageflow_Commands_CreateNodeCommand_Label=Create
-Pageflow_Commands_DeleteNodeCommand_Label=Delete
-
-Pageflow_Commands_ConnectionCommand_Label=Connection
-Pageflow_Commands_CreateBendpointCommand_Label=Create Bendpoint
-Pageflow_Commands_MoveBendpointCommand_Label=Move Bendpoint
-Pageflow_Commands_DeleteBendpointCommand_Label=Delete Bendpoint
-
-Pageflow_Commands_OpenEditorCommand_Label=Open
-Pageflow_Commands_OrphanChildCommand_Label=Orphan Child
-Pageflow_Commands_UpdatePageflowCommand_Label=Update Pageflow
-
-Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Title=Select JSP File
-Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Description=Please select a jsp file.
-
-####################################################
-# Generic Strings for property attribute name
-####################################################
-Pageflow_Model_Attributes_comment=description
-Pageflow_Model_Attributes_name=display-name
-Pageflow_Model_Attributes_largeicon=large-icon
-Pageflow_Model_Attributes_smallicon=small-icon
-
-Pageflow_Model_Attributes_action=from-action
-Pageflow_Model_Attributes_path=path
-Pageflow_Model_Attributes_begin=begin
-Pageflow_Model_Attributes_end=end
-Pageflow_Model_Attributes_configfile=config file
-
-Pageflow_Model_Attributes_source = from-view-id
-Pageflow_Model_Attributes_target = to-view-id
-
-Pageflow_Model_Attributes_outcome=from-outcome
-Pageflow_Model_Attributes_redirect=redirect
-
-Pageflow_Model_Attributes_fromaction=from-action
-Pageflow_Model_Attributes_referenceLink=reference
-
-Pageflow_Model_Items_Pageflow=File
-Pageflow_Model_Items_PFPage=Page
-Pageflow_Model_Items_PFLink=Link
-
-
-Pageflow_Property_Action_OutcomeSelectionDialog_Choice=Enter the outcome or select one from action list below:
-
-Pageflow_Property_Action_OutcomeSelectionDialog_Title=Outcome Selection
-Pageflow_Property_Action_OutcomeSelectionDialog_JSPName=JSP File Name:
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Title=Actions
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Component=Component ID
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action=Action
-
-Pageflow_Property_Action_OutcomeSelectionDialog_Outcome=Outcome:
-
-####################################################
-#Pageflow validation
-####################################################
-Pageflow_Validation_UndefinedOutcome=The outcome \''{0}\'' is not defined in previous page \''{1}\''.
-Pageflow_Validation_NotExistedSourcePage=The source page \''{0}\'' is not existed.
-Pageflow_Validation_MissingSourcePage=The source page should be specified.
-
-Pageflow_Validation_InvalidWebPage=The file \''{0}\'' is not valid web file.
-Pageflow_Validation_NotExitedWebPage=The web page \''{0}\'' is not existed.
-Pageflow_Validation_MissingWebPage=The web page's path should be specified.
-
-Pageflow_Validation_MissingManagedBean=The managed bean \''{0}\'' is not defined.
-Pageflow_Validation_MissingAction=The action should be specified.
-
-ExistingPagePathDialogCellEdito_LabelText = Please enter or select a web page path:
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java
deleted file mode 100644
index 679ca2cca..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gef.palette.ConnectionCreationToolEntry;
-import org.eclipse.gef.palette.MarqueeToolEntry;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteGroup;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PaletteSeparator;
-import org.eclipse.gef.palette.SelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.ModelCreationFactory;
-
-/**
- * This is the root of the palette used by pageflow editors.
- */
-public class PageflowPaletteRoot extends PaletteRoot {
-
- /**
- * Creates a new PageflowPaletteRoot instance.
- */
- public PageflowPaletteRoot() {
- // create root
- super();
-
- // a group of default control tools
- // Pageflow.PaletteTool.Group.Controls = Controls
- PaletteGroup controls = new PaletteGroup(
- PageflowMessages.Pageflow_PaletteTool_Group_Controls); //$NON-NLS-1$
- add(controls);
-
- // the selection tool
- // Pageflow.PaletteTool.Select.Label = Select
- // Pageflow.PaletteTool.Select.Description = Select one or more items
- ToolEntry tool = new SelectionToolEntry(
- PageflowMessages.Pageflow_PaletteTool_Select_Label,
- PageflowMessages.Pageflow_PaletteTool_Select_Description); //$NON-NLS-1$
-
- controls.add(tool);
-
- // use selection tool as default entry
- setDefaultEntry(tool);
-
- // the marquee selection tool
- // Pageflow.PaletteTool.Marquee.Label = Marquee
- // Pageflow.PaletteTool.Marquee.Description = Marquee one or more items
- controls.add(new MarqueeToolEntry(
- PageflowMessages.Pageflow_PaletteTool_Marquee_Label, //$NON-NLS-1$
- PageflowMessages.Pageflow_PaletteTool_Marquee_Description));
-
- controls.add(new PaletteSeparator());
-
- // conection creation
- // Pageflow.PaletteTool.Link.Label = Link
- // Pageflow.PaletteTool.Link.Description = Creates an link
- ConnectionCreationToolEntry linkEntry = new ConnectionCreationToolEntry(
- PageflowMessages.Pageflow_PaletteTool_Link_Label,
- PageflowMessages.Pageflow_PaletteTool_Link_Description,
- new ModelCreationFactory(PageflowLink.class), EditorPlugin
- .getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Link.gif"), //$NON-NLS-1$
- EditorPlugin.getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Link24.gif")); //$NON-NLS-1$
- linkEntry.setUserModificationPermission(PERMISSION_FULL_MODIFICATION);
- controls.add(linkEntry);
-
- controls.add(new PaletteSeparator());
-
- // Pageflow.PaletteTool.Group.Nodes = Nodes
- PaletteDrawer nodes = new PaletteDrawer(
- PageflowMessages.Pageflow_PaletteTool_Group_Nodes); //$NON-NLS-1$
- add(nodes);
-
- // use CombinedTemplateCreationEntry which can be also dragged
- CombinedTemplateCreationEntry entry;
-
- // Pageflow.PaletteTool.Page.Label = Page
- // Pageflow.PaletteTool.Page.Description = Creates a pageflow page
- entry = new CombinedTemplateCreationEntry(
- PageflowMessages.Pageflow_PaletteTool_Page_Label,
- PageflowMessages.Pageflow_PaletteTool_Page_Description,
- PageflowPage.class,
- new ModelCreationFactory(PageflowPage.class), EditorPlugin
- .getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Page16.gif"), //$NON-NLS-1$
- EditorPlugin.getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Page24.gif")); //$NON-NLS-1$
- nodes.add(entry);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java
deleted file mode 100644
index 4c4a8a4df..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.ModelCreationFactory;
-
-/**
- * This is the drop listener for template transfers from the palette. Only need
- * to implement the <code>getFactory</code> method.
- */
-public class PageflowTemplateTransferDropTargetListener extends
- TemplateTransferDropTargetListener {
- /**
- * Creates a new PageflowTemplateTransferDropTargetListener instance.
- *
- * @param viewer -
- * target pageflow editor view.
- */
- public PageflowTemplateTransferDropTargetListener(EditPartViewer viewer) {
- super(viewer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see TemplateTransferDropTargetListener#getFactory(Object)
- */
- protected CreationFactory getFactory(Object template) {
- if (template instanceof Class) {
- return new ModelCreationFactory((Class) template);
- }
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java
deleted file mode 100644
index 405ec44a4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ResourceTransfer;
-import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
-
-/**
- * This is the listener for resource drag and drop operations
- *
- */
-public abstract class ResourceTransferDropTargetListener extends
- AbstractTransferDropTargetListener {
- /** the pageflow editor */
- private IEditorPart editor = null;
-
- /**
- * Creates a new ResourceTransferDropTargetListener instance.
- *
- * @param viewer -
- * target pageflow editor view.
- */
- public ResourceTransferDropTargetListener(EditPartViewer viewer,
- IEditorPart editor) {
- super(viewer, ResourceTransfer.getInstance());
-
- this.editor = editor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#createTargetRequest()
- */
- protected Request createTargetRequest() {
- CreateRequest request = new CreateRequest();
- if (getCurrentEvent().data == null) {
- request.setFactory(getFactory(null));
- } else {
- IResource[] resources = (IResource[]) getCurrentEvent().data;
- request.setFactory(getFactory(resources[0]));
- }
- return request;
- }
-
- /**
- * get the request for creating a new resource object
- *
- * @return - creation request
- */
- protected final CreateRequest getCreateRequest() {
- return (CreateRequest) getTargetRequest();
- }
-
- /**
- * get creation factory for resource object, which should be implemented.
- *
- * @param obj -
- * resource object
- * @return - creation factory for resource object
- */
- abstract protected CreationFactory getFactory(Object obj);
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#handleDragOperationChanged()
- */
- protected void handleDragOperationChanged() {
- getCurrentEvent().detail = DND.DROP_COPY;
- super.handleDragOperationChanged();
- }
-
- /**
- * get the current transfered local selection object.
- *
- * @return
- */
- private Object getCurrentLocalObject() {
- ISelection sel = LocalSelectionTransfer.getInstance().getSelection();
- if (sel instanceof IStructuredSelection) {
- return ((IStructuredSelection) sel).getFirstElement();
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#handleDragOver()
- */
- protected void handleDragOver() {
- if (!isValidJSFFile(getCurrentLocalObject())) {
- getCurrentEvent().detail = DND.ERROR_INVALID_DATA;
- } else {
- getCurrentEvent().detail = DND.DROP_COPY;
- }
- getCurrentEvent().feedback = DND.FEEDBACK_SCROLL | DND.FEEDBACK_EXPAND;
- super.handleDragOver();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#handleDrop()
- */
- protected void handleDrop() {
- getCurrentEvent().detail = DND.DROP_COPY;
- super.handleDrop();
- // because the handle drop can change this event to DND.DROP_NONE
- if (getCurrentEvent().detail == DND.DROP_COPY) {
- selectAddedObject();
- }
- }
-
- /**
- * select the new drag and drop object in the pageflow view.
- */
- private void selectAddedObject() {
- Object model = getCreateRequest().getNewObject();
- if (null == model) {
- return;
- }
- EditPartViewer viewer = getViewer();
- Object editpart = viewer.getEditPartRegistry().get(model);
- if (editpart instanceof EditPart) {
- viewer.flush();
- viewer.select((EditPart) editpart);
- // Activate the editor window
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().activate((FacesConfigEditor) editor);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#updateTargetRequest()
- */
- protected void updateTargetRequest() {
- CreateRequest request = getCreateRequest();
- request.setLocation(getDropLocation());
- }
-
- /**
- * Allow drop if any of these types in the drop data, which can be jsp file
- * or a sub folder of the webroot folder.
- *
- */
- private boolean isValidJSFFile(Object resource) {
- if (resource == null || !(resource instanceof IResource)) {
- return false;
- }
-
- if (((IResource) resource).getProject() == ((FileEditorInput) editor
- .getEditorInput()).getFile().getProject()) {
- if (WebrootUtil.getWebPath(((IResource) resource).getFullPath())
- .length() > 0) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#isEnabled()
- */
- public boolean isEnabled(DropTargetEvent dropTargetEvent) {
- if (super.isEnabled(dropTargetEvent)) {
- if (dropTargetEvent.data != null) {
- IResource[] resources = (IResource[]) dropTargetEvent.data;
- // The resource should be under the same project of the current
- // faces-config file
- if (isValidJSFFile(resources[0])) {
- return true;
- }
- return false;
- }
- // If no data, can't verify, so allow the drop
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java
deleted file mode 100644
index f9c08d80f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.internal.GEFMessages;
-import org.eclipse.gef.internal.InternalImages;
-import org.eclipse.gef.requests.AlignmentRequest;
-import org.eclipse.gef.tools.ToolUtilities;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * An improved alignment action to align the selected parts in different action.
- *
- * @author xgzhang
- * @version original version is from GEF
- */
-public final class AlignmentAction extends SelectionAction {
-
- /**
- * Indicates that the bottom edges should be aligned.
- */
- public static final String ID_ALIGN_BOTTOM = GEFActionConstants.ALIGN_BOTTOM;
-
- /**
- * Indicates that the horizontal centers should be aligned.
- */
- public static final String ID_ALIGN_CENTER = GEFActionConstants.ALIGN_CENTER;
-
- /**
- * Indicates that the left edges should be aligned.
- */
- public static final String ID_ALIGN_LEFT = GEFActionConstants.ALIGN_LEFT;
-
- /**
- * Indicates that the vertical midpoints should be aligned.
- */
- public static final String ID_ALIGN_MIDDLE = GEFActionConstants.ALIGN_MIDDLE;
-
- /**
- * Indicates that the right edges should be aligned.
- */
- public static final String ID_ALIGN_RIGHT = GEFActionConstants.ALIGN_RIGHT;
-
- /**
- * Indicates that the top edges should be aligned.
- */
- public static final String ID_ALIGN_TOP = GEFActionConstants.ALIGN_TOP;
-
- private int alignment;
-
- private List operationSet;
-
- /**
- * @deprecated use AlignmentAction(IWorkbenchPart, int align)
- * @param editor
- * the editor
- * @param align
- * the alignment ID
- */
- public AlignmentAction(IEditorPart editor, int align) {
- this((IWorkbenchPart) editor, align);
- }
-
- /**
- * Constructs an AlignmentAction with the given part and alignment ID. The
- * alignment ID must by one of:
- * <UL>
- * <LI>GEFActionConstants.ALIGN_LEFT
- * <LI>GEFActionConstants.ALIGN_RIGHT
- * <LI>GEFActionConstants.ALIGN_CENTER
- * <LI>GEFActionConstants.ALIGN_TOP
- * <LI>GEFActionConstants.ALIGN_BOTTOM
- * <LI>GEFActionConstants.ALIGN_MIDDLE
- * </UL>
- *
- * @param part
- * the workbench part used to obtain context
- * @param align
- * the aligment ID.
- */
- public AlignmentAction(IWorkbenchPart part, int align) {
- super(part);
- alignment = align;
- initUI();
- }
-
- /**
- * Returns the alignment rectangle to which all selected parts should be
- * aligned.
- *
- * @param request
- * the alignment Request
- * @return the alignment rectangle
- */
- protected Rectangle calculateAlignmentRectangle(Request request) {
- List editparts = getOperationSet(request);
- if (editparts == null || editparts.isEmpty()) {
- return null;
- }
- GraphicalEditPart part = null;
- if (alignment == PositionConstants.MIDDLE
- || alignment == PositionConstants.CENTER) {
- part = (GraphicalEditPart) editparts.get(editparts.size() - 1);
- } else {
- part = getFitnessPart(editparts);
- }
- Rectangle rect = new PrecisionRectangle(part.getFigure().getBounds());
- part.getFigure().translateToAbsolute(rect);
- return rect;
- }
-
- /**
- * get the Fitness part in the four kinds of alignment directions
- *
- * @param editparts
- */
- private GraphicalEditPart getFitnessPart(List editparts) {
- if (alignment == PositionConstants.MIDDLE
- || alignment == PositionConstants.CENTER) {
- return null;
- }
-
- int positionComparor = Integer.MAX_VALUE;
-
- if (alignment == PositionConstants.LEFT
- || alignment == PositionConstants.TOP) {
- positionComparor = Integer.MAX_VALUE;
- } else if (alignment == PositionConstants.RIGHT
- || alignment == PositionConstants.BOTTOM) {
- positionComparor = Integer.MIN_VALUE;
- }
-
- GraphicalEditPart fitnessPart = null;
-
- for (Iterator iter = editparts.iterator(); iter.hasNext();) {
- GraphicalEditPart part = (GraphicalEditPart) iter.next();
- Rectangle rectPart = part.getFigure().getBounds();
- switch (alignment) {
- case PositionConstants.LEFT:
- if (rectPart.getLeft().x < positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getLeft().x;
- }
- break;
-
- case PositionConstants.RIGHT:
- if (rectPart.getRight().x > positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getRight().x;
- }
- break;
- case PositionConstants.TOP:
- if (rectPart.getTop().y < positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getTop().y;
- }
- break;
- case PositionConstants.BOTTOM:
- if (rectPart.getBottom().y > positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getBottom().y;
- }
- break;
- }
- }
-
- return fitnessPart;
- }
-
- /**
- * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#calculateEnabled()
- */
- protected boolean calculateEnabled() {
- operationSet = null;
- Command cmd = createAlignmentCommand();
- if (cmd == null) {
- return false;
- }
- return cmd.canExecute();
- }
-
- private Command createAlignmentCommand() {
- AlignmentRequest request = new AlignmentRequest(
- RequestConstants.REQ_ALIGN);
- request.setAlignmentRectangle(calculateAlignmentRectangle(request));
- request.setAlignment(alignment);
- List editparts = getOperationSet(request);
- if (editparts.size() < 2) {
- return null;
- }
-
- CompoundCommand command = new CompoundCommand();
- command.setDebugLabel(getText());
- for (int i = 0; i < editparts.size(); i++) {
- EditPart editpart = (EditPart) editparts.get(i);
- command.add(editpart.getCommand(request));
- }
- return command;
- }
-
- /**
- * @see org.eclipse.gef.Disposable#dispose()
- */
- public void dispose() {
- operationSet = Collections.EMPTY_LIST;
- super.dispose();
- }
-
- /**
- * Returns the list of editparts which will participate in alignment.
- *
- * @param request
- * the alignment request
- * @return the list of parts which will be aligned
- */
- protected List getOperationSet(Request request) {
- if (operationSet != null) {
- return operationSet;
- }
- List editparts = new ArrayList(getSelectedObjects());
- if (editparts.isEmpty()
- || !(editparts.get(0) instanceof GraphicalEditPart)) {
- return Collections.EMPTY_LIST;
- }
- Object primary = editparts.get(editparts.size() - 1);
- editparts = ToolUtilities.getSelectionWithoutDependants(editparts);
- ToolUtilities.filterEditPartsUnderstanding(editparts, request);
- if (editparts.size() < 2 || !editparts.contains(primary)) {
- return Collections.EMPTY_LIST;
- }
- EditPart parent = ((EditPart) editparts.get(0)).getParent();
- for (int i = 1; i < editparts.size(); i++) {
- EditPart part = (EditPart) editparts.get(i);
- if (part.getParent() != parent) {
- return Collections.EMPTY_LIST;
- }
- }
- return editparts;
- }
-
- /**
- * Initializes the actions UI presentation.
- */
- protected void initUI() {
- switch (alignment) {
- case PositionConstants.LEFT:
- setId(GEFActionConstants.ALIGN_LEFT);
- setText(GEFMessages.AlignLeftAction_Label);
- setToolTipText(GEFMessages.AlignLeftAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
- break;
-
- case PositionConstants.RIGHT:
- setId(GEFActionConstants.ALIGN_RIGHT);
- setText(GEFMessages.AlignRightAction_Label);
- setToolTipText(GEFMessages.AlignRightAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
- break;
-
- case PositionConstants.TOP:
- setId(GEFActionConstants.ALIGN_TOP);
- setText(GEFMessages.AlignTopAction_Label);
- setToolTipText(GEFMessages.AlignTopAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
- break;
-
- case PositionConstants.BOTTOM:
- setId(GEFActionConstants.ALIGN_BOTTOM);
- setText(GEFMessages.AlignBottomAction_Label);
- setToolTipText(GEFMessages.AlignBottomAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
- break;
-
- case PositionConstants.CENTER:
- setId(GEFActionConstants.ALIGN_CENTER);
- setText(GEFMessages.AlignCenterAction_Label);
- setToolTipText(GEFMessages.AlignCenterAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
- break;
-
- case PositionConstants.MIDDLE:
- setId(GEFActionConstants.ALIGN_MIDDLE);
- setText(GEFMessages.AlignMiddleAction_Label);
- setToolTipText(GEFMessages.AlignMiddleAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
- break;
- }
- }
-
- /**
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- operationSet = null;
- execute(createAlignmentCommand());
- }
-
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java
deleted file mode 100644
index 7c27eabd4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- *
- * This is the Action for opening a JSP page in the default JSP Editor from a
- * Pageflow Diagram
- *
- */
-public class OpenEditorAction extends SelectionAction {
- /** The name of the request */
- public static final String OPEN_EDITOR_REQUEST = PageflowMessages.Pageflow_Commands_OpenEditorCommand_Label;
-
- /** The request */
- Request request;
-
- /**
- * The constructor
- *
- * @param part -
- * the IWorkbenchPart
- */
- public OpenEditorAction(IWorkbenchPart part) {
- super(part);
- request = new Request(OPEN_EDITOR_REQUEST);
- // Pageflow.Action.OpenEditor.Label = Edit Page
- setText(PageflowMessages.Pageflow_Action_OpenEditor_Label);
- setId(FacesConfigEditor.EDITOR_ID);
- // Pageflow.Action.OpenEditor.ToolTip = Edit this page
- setToolTipText(PageflowMessages.Pageflow_Action_OpenEditor_ToolTip);
- }
-
- /**
- * Determines if the action can be enabled
- *
- * @return boolean - the enabled state
- */
- protected boolean calculateEnabled() {
- return canPerformAction();
- }
-
- /**
- * Determines if the action can be performed
- *
- * @return boolean - the perform state
- */
- private boolean canPerformAction() {
- if (getSelectedObjects().isEmpty()) {
- return false;
- }
- List parts = getSelectedObjects();
- for (int i = 0; i < parts.size(); i++) {
- Object o = parts.get(i);
- if (!(o instanceof EditPart)) {
- return false;
- }
- EditPart part = (EditPart) o;
- if (!(part.getModel() instanceof PageflowPage)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Returns the command for the action
- *
- * @return Command - the action command
- */
- private Command getCommand() {
- List editparts = getSelectedObjects();
- CompoundCommand cc = new CompoundCommand();
- cc.setDebugLabel(OPEN_EDITOR_REQUEST);
- for (int i = 0; i < editparts.size(); i++) {
- EditPart part = (EditPart) editparts.get(i);
- cc.add(part.getCommand(request));
- }
- return cc;
- }
-
- /**
- * Runs the command
- */
- public void run() {
- execute(getCommand());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#execute(org.eclipse.gef.commands.Command)
- */
- protected void execute(Command command) {
- if (command == null || !command.canExecute()) {
- return;
- }
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java
deleted file mode 100644
index bed60b14a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- *
- * This is the Action for opening a JSP page in the default JSP Editor from a
- * Pageflow Diagram
- *
- * @author Xiao-guang Zhang
- */
-public class ShowPropertyViewAction extends SelectionAction {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(ShowPropertyViewAction.class);
-
- /** The ID of the action */
- public static final String SHOW_PROPERTY_VIEW = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.ShowPropertyViewAction"; //$NON-NLS-1$
-
- /**
- * The constructor
- *
- * @param part -
- * the IWorkbenchPart
- */
- public ShowPropertyViewAction(IWorkbenchPart part) {
- super(part);
- // Pageflow.Action.ShowPropertyView.Label = Properties
- setText(PageflowMessages.Pageflow_Action_ShowPropertyView_Label); //$NON-NLS-1$
- setId(SHOW_PROPERTY_VIEW);
- // Pageflow.Action.ShowPropertyView.ToolTip = Show properties
- setToolTipText(PageflowMessages.Pageflow_Action_ShowPropertyView_ToolTip); //$NON-NLS-1$
- }
-
- /**
- * Determines if the action can be enabled
- *
- * @return boolean - the enabled state
- */
- protected boolean calculateEnabled() {
- return canPerformAction();
- }
-
- /**
- * Determines if the action can be performed
- *
- * @return boolean - the perform state
- */
- private boolean canPerformAction() {
- if (getSelectedObjects().isEmpty()) {
- return false;
- }
- List parts = getSelectedObjects();
- for (int i = 0; i < parts.size(); i++) {
- Object o = parts.get(i);
- if (!(o instanceof EditPart)) {
- return false;
- }
- EditPart part = (EditPart) o;
- if (!((part.getModel() instanceof PageflowElement))) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Runs the command
- */
- public void run() {
- List editparts = getSelectedObjects();
- if (editparts.size() > 0) {
- EditPart part = (EditPart) editparts.get(0);
- // execute(getCommand());
- if (part.getModel() instanceof PageflowElement) {
- // ensure the visibility of the palette view and property veiw.
- IWorkbenchWindow dw = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- IWorkbenchPage page = dw.getActivePage();
- if (page != null) {
- try {
- page.showView("org.eclipse.ui.views.PropertySheet");
- } catch (PartInitException e) {
- // Pageflow.PageflowEditor.Error.canNotShowPropertyView
- // = Failed to show property sheet view.
- log
- .error(
- "Pageflow.PageflowEditor.Error.canNotShowPropertyView",
- e);
- }
-
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java
deleted file mode 100644
index 46c7a518c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-
-/**
- * A batched edit command will enable adapters to interven before and after a
- * set of operations was done by sending notification to the adapters.
- *
- * @author hmeng
- */
-
-public abstract class AbstractBatchEditCommand extends Command {
- Pageflow pageflow;
-
- public AbstractBatchEditCommand(Pageflow pageflow) {
- super();
- this.pageflow = pageflow;
- }
-
- public AbstractBatchEditCommand(Pageflow pageflow, String label) {
- super(label);
- this.pageflow = pageflow;
- }
-
- public Pageflow getPageflow() {
- return pageflow;
- }
-
- /**
- * The subclass should extend methods doXXX only.
- */
- final public void execute() {
- preExecute();
- doExecute();
- postExecute();
- }
-
- final public void redo() {
- doRedo();
- }
-
- final public void undo() {
- preExecute();
- doUndo();
- postExecute();
- }
-
- abstract public void doExecute();
-
- public void doRedo() {
- execute();
- }
-
- abstract void doUndo();
-
- final void preExecute() {
- getPageflow().eNotify(
- new ENotificationImpl((InternalEObject) getPageflow(),
- FC2PFTransformer.MY_NOTIFICATION_TYPE,
- PageflowPackage.PAGEFLOW, null, null));
- }
-
- final protected void postExecute() {
- getPageflow().eNotify(
- new ENotificationImpl((InternalEObject) getPageflow(),
- FC2PFTransformer.MY_NOTIFICATION_TYPE1,
- PageflowPackage.PAGEFLOW, null, null));
- notifyPageflow(getPageflow());
- }
-
- protected void notifyPageflow(Pageflow pageflow) {
- pageflow.notifyModelChanged(new ENotificationImpl(
- (InternalEObject) pageflow, Notification.ADD,
- PageflowPackage.PAGEFLOW, null, null));
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java
deleted file mode 100644
index 24cebc53c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout.PageflowLayoutManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-
-/**
- * Add a new connection
- *
- * @author hmeng
- *
- */
-public class AddConnectionCommand extends ConnectionCommand {
-
- public boolean canExecute() {
- // if user don't set PFLink object before, this command can't be
- // executed.
- if (link == null) {
- return false;
- }
-
- // It is a connection create command
- if (oldSource == null && oldTarget == null) {
- // It is a connection create command
- // Source and target must be pointing to some
- // real connection point
- if (source == null || target == null) {
- return false;
- }
-
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- source, target)) {
- return false;
- }
- }
- return true;
- }
-
- public void doExecute() {
- // It is a connection create command
- if (canExecute() && oldSource == null && oldTarget == null) {
- Pageflow pageflow = null;
- // Get a reference to the pageflow
- if (source != null) {
- pageflow = source.getPageflow();
- } else if (target != null) {
- pageflow = target.getPageflow();
- }
- pageflow.connect(source, target, link);
-
- // self loop link
- if (source == target) {
- PageflowLayoutManager.updateSelfLoopLink(link);
- }
- }
- }
-
- public void redo() {
- // TODO Auto-generated method stub
- super.redo();
- }
-
- public void undo() {
- if (canExecute()) {
- // It was a connection create command
- if (oldSource == null && oldTarget == null) {
-
- Pageflow pageflow = null;
- // Get a reference to the pageflow
- if (source != null) {
- pageflow = source.getPageflow();
- } else if (target != null) {
- pageflow = target.getPageflow();
- }
-
- // Ensure that link knows nothing about nodes anymore.
- link.setSource(null);
- link.setTarget(null);
- // Remove link from pageflow
- pageflow.getLinks().remove(link);
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java
deleted file mode 100644
index 2fcc0d5e1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * This is the add command for pageflow editpart
- *
- */
-public class AddNodeCommand extends Command {
- /** Pageflow node including Page, action, begin, end. */
- private PageflowNode child;
-
- /** parent Pageflow */
- private Pageflow parent;
-
- /** index of pageflow nodes */
- private int index = -1;
-
- public AddNodeCommand() {
- // Pageflow.Commands.AddNodeCommand.Label = add
- super(PageflowMessages.Pageflow_Commands_AddNodeCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- if (index < 0) {
- parent.getNodes().add(child);
- } else {
- parent.getNodes().add(index, child);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- if (index < 0) {
- parent.getNodes().add(child);
- } else {
- parent.getNodes().add(index, child);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- parent.getNodes().remove(child);
- }
-
- /**
- * get parent pageflow of the node.
- *
- */
- public Pageflow getParent() {
- return parent;
- }
-
- /**
- * Set the child pageflow node
- *
- * @param subpart -
- * child pageflow node
- */
- public void setChild(PageflowNode subpart) {
- child = subpart;
- }
-
- /**
- * Creates a new AbstractEditorPage instance.
- *
- * @param i -
- * index of pageflow node
- */
- public void setIndex(int i) {
- index = i;
- }
-
- /**
- * Set the new parent pageflow
- *
- * @param newParent -
- * parent pageflow
- */
- public void setParent(Pageflow newParent) {
- parent = newParent;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java
deleted file mode 100644
index cf03f6c2b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-
-/**
- * base class for bend point commands.
- *
- */
-public abstract class BendpointCommand extends Command {
- /** the index of the bend point */
- protected int index;
-
- /** the location of the bendpoint */
- protected Point location;
-
- /** the parent link */
- protected PageflowLink link;
-
- /** relative dimension between the bendpoint with start point of the pflink */
- private Dimension dimStart;
-
- /** relative dimension between the bendpoint with end point of the pflink */
- private Dimension dimEnd;
-
- public BendpointCommand(String label) {
- super(label);
- }
-
- /**
- * get the dimension between the bendpoint and start point
- *
- * @return - the start dimension
- */
- protected Dimension getFirstRelativeDimension() {
- return dimStart;
- }
-
- /**
- * get the dimension between the bendpoint and end point
- *
- * @return - the end dimension
- */
- protected Dimension getSecondRelativeDimension() {
- return dimEnd;
- }
-
- /**
- * get the index of the bend point
- *
- * @return - the index
- */
- protected int getIndex() {
- return index;
- }
-
- /**
- * get the location of the bend point
- *
- * @return - the index
- */
- protected Point getLocation() {
- return location;
- }
-
- /**
- * get the parent link
- *
- * @return - parent link
- */
- protected PageflowLink getPFLink() {
- return link;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- execute();
- }
-
- /**
- * set the relative dimensions of the bendpoint
- *
- * @param dim1 -
- * the dimension between the bendpoint and start point
- * @param dim2 -
- * the dimension between the bendpoint and end point
- */
- public void setRelativeDimensions(Dimension dim1, Dimension dim2) {
- dimStart = dim1;
- dimEnd = dim2;
- }
-
- /**
- * set the index of the bendpoint in the bendpoint list
- *
- * @param i -
- * index
- */
- public void setIndex(int i) {
- index = i;
- }
-
- /**
- * set the location of the bendpoing
- *
- * @param p -
- * new location
- */
- public void setLocation(Point p) {
- location = p;
- }
-
- /**
- * set the parent link
- *
- * @param newLink -
- * new parent pflink
- */
- public void setPFLink(PageflowLink newLink) {
- link = newLink;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java
deleted file mode 100644
index 62b055135..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * This is the connection command for pageflow editpart
- *
- * @author Xiao-guang Zhang, hmeng
- */
-public abstract class ConnectionCommand extends Command {
- /** Old source pageflow node */
- protected PageflowNode oldSource;
-
- /** Old target pageflow node */
- protected PageflowNode oldTarget;
-
- /** New source pageflow node */
- protected PageflowNode source;
-
- /** New target pageflow node */
- protected PageflowNode target;
-
- /** pageflow link */
- protected PageflowLink link;
-
- public ConnectionCommand() {
- super(PageflowMessages.Pageflow_Commands_ConnectionCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#canExecute()
- */
- public boolean canExecute() {
- return TransformUtil.isValidPageflowElement(link);
- }
-
- protected void doExecute() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public final void execute() {
- if (canExecute()) {
- doExecute();
- } else {
- link = null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- execute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ommand#undo()
- */
- public void undo() {
- }
-
- /**
- * Get the source pageflow node
- *
- * @return - the source pageflow node
- */
- public PageflowNode getSource() {
- return source;
- }
-
- /**
- * Get the target pageflow node
- *
- * @return - the target pageflow node.
- */
- public PageflowNode getTarget() {
- return target;
- }
-
- /**
- * Get the pageflow link
- *
- * @return - the pageflow link.
- */
- public PageflowLink getPFLink() {
- return link;
- }
-
- /**
- * Set the source pageflow node
- *
- * @param newSource -
- * new source pageflow node
- */
- public void setSource(PageflowNode newSource) {
- source = newSource;
- }
-
- /**
- * Set the target pageflow node
- *
- * @param newTarget -
- * new target pageflow node
- */
- public void setTarget(PageflowNode newTarget) {
- target = newTarget;
- }
-
- /**
- * Set the pageflow link
- *
- * @param link -
- * new pageflow link
- */
- public void setPFLink(PageflowLink link) {
- this.link = link;
- oldSource = link.getSource();
- oldTarget = link.getTarget();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java
deleted file mode 100644
index 0df591cee..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-
-/**
- * The factory helps to create connection commands.
- *
- * @author hmeng
- *
- */
-public class ConnectionCommandFactory {
- public static ConnectionCommand createCommand(Request request) {
- ConnectionCommand command = null;
- if (request.getType() == RequestConstants.REQ_CONNECTION_START
- || request.getType() == RequestConstants.REQ_CONNECTION_END) {
- command = new AddConnectionCommand();
- } else if (request.getType() == RequestConstants.REQ_RECONNECT_SOURCE
- || request.getType() == RequestConstants.REQ_RECONNECT_TARGET) {
- command = new ReconnectConnectionCommand();
- } else if (request.getType() == RequestConstants.REQ_DELETE) {
- command = new DeleteConnectionCommand();
- }
- return command;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java
deleted file mode 100644
index 0de57b97e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * Create a new bend point command
- *
- */
-public class CreateBendpointCommand extends BendpointCommand {
- public CreateBendpointCommand() {
- // Pageflow.Commands.CreateBendpointCommand.Label = Create Bendpoint
- super(PageflowMessages.Pageflow_Commands_CreateBendpointCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage pageflowPackage = (PageflowPackage) registry
- .get(pageflowURI);
- PageflowFactory factory = pageflowPackage.getPageflowFactory();
- PageflowLinkBendpoint _newBendpoint = factory.createPFLinkBendpoint();
-
- _newBendpoint.setRelativeDimensions(getFirstRelativeDimension(),
- getSecondRelativeDimension());
- getPFLink().insertBendpoint(getIndex(), _newBendpoint);
- super.execute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- super.undo();
- getPFLink().removeBendpoint(getIndex());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java
deleted file mode 100644
index 30250e205..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.common.IFileFolderConstants;
-import org.eclipse.jst.jsf.facesconfig.common.dialogs.CommonResourceDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * This is the creation command for pageflow editpart
- *
- * @author Xiao-guang Zhang
- */
-public class CreateNodeCommand extends Command implements IPreExecuteCommand {
- private static final String UNNAMED_NODE = "unnamed";
-
- /** new pageflow node */
- private PageflowNode child;
-
- /** size of pageflow node figure */
- private Rectangle rect;
-
- /** parent pageflow */
- private Pageflow parent;
-
- /** index of pageflow nodes */
- // private int _index = -1;
- public CreateNodeCommand() {
- // Pageflow.Commands.CreateNodeCommand.Label = Create new node
- super(PageflowMessages.Pageflow_Commands_CreateNodeCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute() {
- return child != null && parent != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- if (rect != null) {
- child.setX(rect.x);
- child.setY(rect.y);
- if (!rect.isEmpty()) {
- child.setHeight(rect.getSize().height);
- child.setWidth(rect.getSize().width);
- }
- }
-
- if (child.getName() == UNNAMED_NODE) {
- child.setName(parent.getDefaultNodeName(child.getClass()));
- }
-
- parent.getNodes().add(child);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- if (rect != null) {
- child.setX(rect.x);
- child.setY(rect.y);
- if (!rect.isEmpty()) {
- child.setHeight(rect.getSize().height);
- child.setWidth(rect.getSize().width);
- }
- }
-
- parent.getNodes().add(child);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- parent.getNodes().remove(child);
- }
-
- /**
- * select a jsp page in current project.
- *
- * @return
- */
- private boolean selectJSPPage() {
-
- Shell shell = null;
- IWorkbenchWindow workbenchWindow = EditorPlugin
- .getActiveWorkbenchWindow();
- if (workbenchWindow.getShell() != null) {
- shell = workbenchWindow.getShell();
- } else {
- shell = new Shell();
- }
- IProject project = WebrootUtil.getProject(getParent());
-
- CommonResourceDialog dialog = new CommonResourceDialog(shell, project,
- SWT.NONE);
-
- dialog
- .setTitle(PageflowMessages.Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Title);
- dialog.setSuffixs(new String[] { IFileFolderConstants.EXT_JSP,
- IFileFolderConstants.EXT_JSV, IFileFolderConstants.EXT_JTPL,
- IFileFolderConstants.EXT_JSPX });
- dialog
- .setResourceDescription(PageflowMessages.Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Description);
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- if (result != null) {
- IFile jspFile = (IFile) result[0];
- if (jspFile != null) {
- // get the project path for the new created file, i.e.,
- // /project/webroot/*.jsp
- String jsfSelection = WebrootUtil.getWebPath(jspFile
- .getFullPath());
- if (jsfSelection != null && jsfSelection.length() > 0) {
- if (PageflowValidation.getInstance().isExistedPage(
- this.parent, jsfSelection)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle =
- // Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage = The
- // web page {0} is already existed in current
- // PageFlow.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle",
- "Pageflow.PageflowEditor.Alert.ExistingPage",
- jsfSelection);
- return false;
- }
-
- ((PageflowPage) (child)).setPath(jsfSelection);
- ((PageflowPage) (child)).setName(WebrootUtil
- .getPageNameFromWebPath(jsfSelection));
- }
-
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * call the JSF wizard to create a new jsf page.
- *
- *
- */
- public Pageflow getParent() {
- return parent;
- }
-
- /**
- * set the child node
- *
- * @param subpart -
- * new child pageflow node
- */
- public void setChild(PageflowNode subpart) {
- child = subpart;
- }
-
- /**
- * set the location of the new pageflow node
- *
- * @param r -
- * location of the new pageflow node
- */
- public void setLocation(Rectangle r) {
- rect = r;
- }
-
- /**
- * set the parent pageflow
- *
- * @param newParent -
- * the new parent pageflow
- */
- public void setParent(Pageflow newParent) {
- parent = newParent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.commands.IPreExecuteCommand#preExecute()
- */
- public boolean preExecute() {
- // note that the model adds the ports to the node in this call
- // pop up the new the wizard to create the new jsf file
- if (child instanceof PageflowPage) {
- // if the new page's file path is not empty, i.e., drag a file from
- // resource navigator view
- if (null != ((PageflowPage) child).getPath()) {
- if (PageflowValidation.getInstance().isExistedPage(parent,
- (PageflowPage) child)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle = Pageflow
- // Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage = The web page
- // {0} is already existed in current PageFlow.
- EditorPlugin.getAlerts().error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle",
- "Pageflow.PageflowEditor.Alert.ExistingPage",
- ((PageflowPage) child).getPath());
- return false;
- }
- } else
- // create a new jsf page from scratch
- {
- // return createNewJSFPage();
- return selectJSPPage();
- }
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java
deleted file mode 100644
index 56b21a432..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.EventObject;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-/**
- * This is a delegating command stack, which delegates everything to another
- * CommandStack except event listners.
- * <p>
- * Event listeners registered to a <code>DelegatingCommandStack</code> will be
- * informed whenever the underlying <code>CommandStack</code> changes. They
- * will not be registered to the underlying <code>CommandStack</code> directly
- * but they will be informed about change events of them.
- *
- */
-public class DelegatingCommandStack extends CommandStack implements
- CommandStackListener {
- /** the empty object array */
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[] {};
-
- /** the current command stack */
- private CommandStack currentCommandStack = null;
-
- /**
- * Returns the current <code>CommandStack</code>.
- *
- * @return - the current <code>CommandStack</code>
- */
- public CommandStack getCurrentCommandStack() {
- return currentCommandStack;
- }
-
- /**
- * Sets the current <code>CommandStack</code>.
- *
- * @param stack -
- * the <code>CommandStack</code> to set
- */
- public void setCurrentCommandStack(CommandStack stack) {
- if (currentCommandStack == stack) {
- return;
- }
-
- // remove from old command stack
- if (null != currentCommandStack) {
- currentCommandStack.removeCommandStackListener(this);
- }
-
- // set new command stack
- currentCommandStack = stack;
-
- if (currentCommandStack != null) {
- // watch new command stack
- currentCommandStack.addCommandStackListener(this);
-
- // the command stack changed
- notifyListeners();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#canRedo()
- */
- public boolean canRedo() {
- if (null == currentCommandStack) {
- return false;
- }
-
- return currentCommandStack.canRedo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#canUndo()
- */
- public boolean canUndo() {
- if (null == currentCommandStack) {
- return false;
- }
-
- return currentCommandStack.canUndo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#dispose()
- */
- public void dispose() {
- if (null != currentCommandStack) {
- currentCommandStack.dispose();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#execute(org.eclipse.gef.commands.Command)
- */
- public void execute(Command command) {
- if (null != currentCommandStack) {
- currentCommandStack.execute(command);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#flush()
- */
- public void flush() {
- if (null != currentCommandStack) {
- currentCommandStack.flush();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getCommands()
- */
- public Object[] getCommands() {
- if (null == currentCommandStack) {
- return EMPTY_OBJECT_ARRAY;
- }
-
- return currentCommandStack.getCommands();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getRedoCommand()
- */
- public Command getRedoCommand() {
- if (null == currentCommandStack) {
- return UnexecutableCommand.INSTANCE;
- }
-
- return currentCommandStack.getRedoCommand();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getUndoCommand()
- */
- public Command getUndoCommand() {
- if (null == currentCommandStack) {
- return UnexecutableCommand.INSTANCE;
- }
-
- return currentCommandStack.getUndoCommand();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getUndoLimit()
- */
- public int getUndoLimit() {
- if (null == currentCommandStack) {
- return -1;
- }
-
- return currentCommandStack.getUndoLimit();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#isDirty()
- */
- public boolean isDirty() {
- if (null == currentCommandStack) {
- return false;
- }
-
- return currentCommandStack.isDirty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#markSaveLocation()
- */
- public void markSaveLocation() {
- if (null != currentCommandStack) {
- currentCommandStack.markSaveLocation();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#redo()
- */
- public void redo() {
- if (null != currentCommandStack) {
- currentCommandStack.redo();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#setUndoLimit(int)
- */
- public void setUndoLimit(int undoLimit) {
- if (null != currentCommandStack) {
- currentCommandStack.setUndoLimit(undoLimit);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#undo()
- */
- public void undo() {
- if (null != currentCommandStack) {
- currentCommandStack.undo();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Object#toString()
- */
- public String toString() {
- return "DelegatingCommandStack(" + currentCommandStack + ")";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStackListener#commandStackChanged(java.util.EventObject)
- */
- public void commandStackChanged(EventObject event) {
- notifyListeners();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java
deleted file mode 100644
index 556389edc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-
-/**
- *
- */
-public class DeleteBendpointCommand extends BendpointCommand {
-
- /** the deleting bendpoint */
- private PageflowLinkBendpoint bendpoint;
-
- public DeleteBendpointCommand() {
-
- // Pageflow.Commands.DeleteBendpointCommand.Label = Delete Bendpoint
- super(PageflowMessages.Pageflow_Commands_DeleteBendpointCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- super.execute();
- bendpoint = (PageflowLinkBendpoint) getPFLink().getBendPoints().get(
- getIndex());
- getPFLink().removeBendpoint(getIndex());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- super.undo();
- getPFLink().insertBendpoint(getIndex(), bendpoint);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java
deleted file mode 100644
index 068248b5a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-/**
- * Delete a connection.
- *
- * @author hmeng
- *
- */
-public class DeleteConnectionCommand extends ConnectionCommand {
-
- public boolean canExecute() {
- return link != null;
- }
-
- protected void doExecute() {
- // It is a delete connection command
- if (link != null) {
- link.setSource(null);
- link.setTarget(null);
- oldSource.getPageflow().getLinks().remove(link);
- link.eAdapters().clear();
- }
- }
-
- public void undo() {
- // It is a delete connection command
- if (canExecute()) {
- link.setSource(oldSource);
- link.setTarget(oldTarget);
- oldSource.getPageflow().getLinks().add(link);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java
deleted file mode 100644
index c632e25f1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * This is the delete command for pageflow editpart
- *
- */
-public class DeleteNodeCommand extends AbstractBatchEditCommand {
- /** the deleting pageflow node */
- private PageflowNode child;
-
- /** parent pageflow */
- private Pageflow parent;
-
- /** index of pageflow nodes */
- private int index = -1;
-
- /** source connections with the deleting node */
- private List sourceConnections = new ArrayList();
-
- private List sourceConnectionSources = new ArrayList();
-
- private List sourceConnectionTargets = new ArrayList();
-
- /** target connections with the deleting node */
- private List targetConnections = new ArrayList();
-
- private List targetConnectionSources = new ArrayList();
-
- private List targetConnectionTargets = new ArrayList();
-
- public DeleteNodeCommand(Pageflow pageflow) {
- // Pageflow.Commands.DeleteNodeCommand.Label = Delete
- super(pageflow, PageflowMessages.Pageflow_Commands_DeleteNodeCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void doExecute() {
- primExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void doRedo() {
- primExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void doUndo() {
- parent.getNodes().add(index, child);
- restoreConnections(child);
- }
-
- /**
- * delete the connections related with the pageflow node.
- *
- * @param node -
- * the deleting pageflow node
- */
- private void deleteConnections(PageflowNode node) {
- while (node.getOutlinks().size() > 0) {
- // Note:should save the source and target of the link, otherwise
- // source and target will be lost,
- // when the source and target node remove the link.
- PageflowLink link = (PageflowLink) node.getOutlinks().get(0);
- sourceConnections.add(link);
- sourceConnectionSources.add(link.getSource());
- sourceConnectionTargets.add(link.getTarget());
-
- link.getTarget().getInlinks().remove(link);
- node.getOutlinks().remove(link);
- parent.getLinks().remove(link);
- }
-
- while (node.getInlinks().size() > 0) {
- // Note: should save the source and target of the link, otherwise
- // source and target will be lost,
- // when the source and target node remove the link.
- PageflowLink link = (PageflowLink) node.getInlinks().get(0);
- targetConnections.add(link);
- targetConnectionSources.add(link.getSource());
- targetConnectionTargets.add(link.getTarget());
-
- link.getSource().getOutlinks().remove(link);
- node.getInlinks().remove(link);
- parent.getLinks().remove(link);
- }
- }
-
- /**
- * execute the delete command
- *
- *
- */
- protected void primExecute() {
- deleteConnections(child);
- index = parent.getNodes().indexOf(child);
- parent.getNodes().remove(child);
- }
-
- /**
- * restore the connections of the deleted pageflow node
- *
- * @param node -
- * the deleted pageflow node
- */
- private void restoreConnections(PageflowNode node) {
- for (int i = 0; i < sourceConnections.size(); i++) {
- // restore the link with the source and target
- PageflowLink link = (PageflowLink) sourceConnections.get(i);
- PageflowNode source = (PageflowNode) sourceConnectionSources.get(i);
- PageflowNode target = (PageflowNode) sourceConnectionTargets.get(i);
- link.setSource(source);
- link.setTarget(target);
-
- parent.getLinks().add(link);
- node.getOutlinks().add(link);
- link.getTarget().getInlinks().add(link);
- }
- sourceConnections.clear();
- for (int i = 0; i < targetConnections.size(); i++) {
- // restore the link with the source and target
- PageflowLink link = (PageflowLink) targetConnections.get(i);
- PageflowNode source = (PageflowNode) targetConnectionSources.get(i);
- PageflowNode target = (PageflowNode) targetConnectionTargets.get(i);
- link.setSource(source);
- link.setTarget(target);
-
- parent.getLinks().add(link);
- node.getInlinks().add(link);
- link.getSource().getOutlinks().add(link);
- }
- targetConnections.clear();
- }
-
- /**
- * set the child pageflow node
- *
- * @param c -
- * the child pageflow node
- */
- public void setChild(PageflowNode c) {
- child = c;
- }
-
- /**
- * set the parent pageflow
- *
- * @param p -
- * the parent pageflow
- */
- public void setParent(Pageflow p) {
- parent = p;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java
deleted file mode 100644
index 7e23cf251..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-
-/**
- * This class is used to adapter EMF Command to GEF Command.
- *
- * @author xgzhang
- * @version
- */
-public class EMFCommandGEFAdapter extends Command {
- private org.eclipse.emf.common.command.Command emfCommand;
-
- /**
- *
- */
- public EMFCommandGEFAdapter(
- org.eclipse.emf.common.command.Command emfCommand) {
- super();
- this.emfCommand = emfCommand;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute() {
- if (emfCommand == null) {
- return false;
- }
- return emfCommand.canExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#canUndo()
- */
- public boolean canUndo() {
- if (emfCommand == null) {
- return false;
- }
- return emfCommand.canUndo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#dispose()
- */
- public void dispose() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#execute()
- */
- public void execute() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.execute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#getLabel()
- */
- public String getLabel() {
- if (emfCommand == null) {
- return null;
- }
- return emfCommand.getLabel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#redo()
- */
- public void redo() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.redo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#undo()
- */
- public void undo() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.undo();
- }
-
- /**
- *
- */
- public org.eclipse.emf.common.command.Command getEMFCommand() {
- return emfCommand;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java
deleted file mode 100644
index a22e62a19..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.EventObject;
-
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-
-/**
- * This adapter is used to let editor be able to monitor EMF CommandStack, e.g.,
- * in StructuredTextEditor, using GEF CommandStack.
- *
- * @author xgzhang
- * @version
- */
-public class EMFCommandStackGEFAdapter extends CommandStack implements
- CommandStackListener {
- private org.eclipse.emf.common.command.BasicCommandStack emfCommandStack;
-
- /**
- *
- */
- public EMFCommandStackGEFAdapter(
- org.eclipse.emf.common.command.BasicCommandStack emfCommandStack) {
- super();
- this.emfCommandStack = emfCommandStack;
- this.emfCommandStack.addCommandStackListener(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#canRedo()
- */
- public boolean canRedo() {
- if (emfCommandStack == null) {
- return false;
- }
- return emfCommandStack.canRedo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#canUndo()
- */
- public boolean canUndo() {
- if (emfCommandStack == null) {
- return false;
- }
- return emfCommandStack.canUndo();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#execute(org.eclipse.gef.commands.Command)
- */
- public void execute(Command command) {
- if (!(command instanceof EMFCommandGEFAdapter)) {
- return;
- }
-
- org.eclipse.emf.common.command.Command emfCommand = ((EMFCommandGEFAdapter) command)
- .getEMFCommand();
- if (emfCommand != null) {
- emfCommandStack.execute(emfCommand);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#flush()
- */
- public void flush() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.flush();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#getRedoCommand()
- */
- public Command getRedoCommand() {
- if (emfCommandStack == null || emfCommandStack.getRedoCommand() == null) {
- return null;
- }
-
- return new EMFCommandGEFAdapter(emfCommandStack.getRedoCommand());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#getUndoCommand()
- */
- public Command getUndoCommand() {
- if (emfCommandStack == null || emfCommandStack.getUndoCommand() == null) {
- return null;
- }
-
- return new EMFCommandGEFAdapter(emfCommandStack.getUndoCommand());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#isDirty()
- */
- public boolean isDirty() {
- if (emfCommandStack == null) {
- return false;
- }
- return emfCommandStack.isSaveNeeded();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#markSaveLocation()
- */
- public void markSaveLocation() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.saveIsDone();
- super.markSaveLocation();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#redo()
- */
- public void redo() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.redo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#undo()
- */
- public void undo() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.undo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStackListener#commandStackChanged(java.util.EventObject)
- */
- public void commandStackChanged(EventObject event) {
- this.notifyListeners();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java
deleted file mode 100644
index f20f2ae1e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-/**
- * Command with pre execute checking.
- *
- * @author Xiao-guang Zhang
- *
- *
- */
-public interface IPreExecuteCommand {
- /**
- * Do something pre-execution of the actual command execution.
- *
- * @return - successful to do the pre-execution
- */
- boolean preExecute();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java
deleted file mode 100644
index a2468c9dd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * Move bend point command
- */
-public class MoveBendpointCommand extends BendpointCommand {
- /**
- * old bend point of the link
- */
- private PageflowLinkBendpoint oldBendpoint;
-
- public MoveBendpointCommand() {
- // Pageflow.Commands.MoveBendpointCommand.Label = Move Bendpoint
- super(PageflowMessages.Pageflow_Commands_MoveBendpointCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage pageflowPackage = (PageflowPackage) registry
- .get(pageflowURI);
- PageflowFactory factory = pageflowPackage.getPageflowFactory();
- PageflowLinkBendpoint _newBendpoint = factory.createPFLinkBendpoint();
-
- _newBendpoint.setRelativeDimensions(getFirstRelativeDimension(),
- getSecondRelativeDimension());
- setOldBendpoint((PageflowLinkBendpoint) getPFLink().getBendPoints().get(
- getIndex()));
-
- getPFLink().setBendpoint(getIndex(), _newBendpoint);
- super.execute();
- }
-
- /**
- * get the old bend point
- *
- * @return - old bend point
- */
- protected PageflowLinkBendpoint getOldBendpoint() {
- return oldBendpoint;
- }
-
- /**
- * set the old bend point
- *
- * @param bp -
- * old bend point
- */
- public void setOldBendpoint(PageflowLinkBendpoint bp) {
- oldBendpoint = bp;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- super.undo();
- getPFLink().setBendpoint(getIndex(), getOldBendpoint());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java
deleted file mode 100644
index b3bfbc205..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-/**
- *
- * This is the Command for opening a file in its default editor
- *
- * @author Xiao-guang Zhang
- */
-public class OpenEditorCommand extends org.eclipse.gef.commands.Command {
- /** The selected object */
- private PageflowNodeImpl child = null;
-
- /** The edit part */
- private EditPart part;
-
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(FacesConfigEditor.class);
-
- /*
- * (non-Javadoc)
- *
- * @see Command#canExecute()
- */
- public boolean canExecute() {
- return true;
- }
-
- /**
- * The constructor
- *
- * @param part -
- * the EditPart
- */
- public OpenEditorCommand(EditPart part) {
- // Pageflow.Commands.OpenEditorCommand.Label = Open Editor
- super(PageflowMessages.Pageflow_Commands_OpenEditorCommand_Label);
- this.part = part;
- }
-
- /**
- * Sets the selected object
- *
- * @param child -
- * the PFPageImpl
- */
- public void setChild(PageflowNodeImpl child) {
- this.child = child;
- }
-
- public PageflowNodeImpl getChild() {
- return child;
- }
-
- /**
- * open existed JSF file or call the wizard to create a new one.
- *
- * @param void
- */
- private void executeOpenPFPage() {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- String pagePath = ((PageflowPage) (part.getModel())).getPath();
-
- // Check the fileName is empty or not
- if (pagePath != null && pagePath.length() > 0) {
- String resourceName = WebrootUtil.getProjectPath((EObject) part
- .getModel(), pagePath);
- Path resourcePath = new Path(resourceName);
- if (resourcePath.getFileExtension() != null
- && WebrootUtil.isValidWebFile(resourcePath)) {
-
- final IFile file = (IFile) workspaceRoot
- .findMember(resourcePath);
- openExistingJSFFile(file);
- } else {
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open
- // JSF File Error
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo =
- // This page is related with JSF folder. CAN'T be edited.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle",
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo");
- }
- } else
- // if the fileName is empty, a new jsf file should be created!
- {
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open JSF
- // File Error
- // Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFile = No jsp
- // file is related with this page.
- EditorPlugin.getAlerts().error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle",
- "Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFile");// )
- }
- }
-
- /**
- * open existing jsf file in a new editor.
- *
- * @param file
- */
- private void openExistingJSFFile(final IFile file) {
- // if the file is existed, open it.
- if (null != file && file.exists()) {
- Display display = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell().getDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- try {
- IDE.openEditor(page, file, true);
- } catch (PartInitException e) {
- // Pageflow.PageflowEditor.Error.CanNotOpenEditor4JSF =
- // The jsf file can not be opened in the editor.
- log
- .error(
- "Pageflow.PageflowEditor.Error.canNotOpenEditor4JSF",
- e);
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle
- // = Open JSF File Error
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle",
- "Pageflow.PageflowEditor.Error.CanNotOpenEditor4JSF");
- }
- }
- });
- } else
- // otherwise, pop-up a error message box
- {
- String pagePath = ((PageflowPage) (part.getModel())).getPath();
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open JSF
- // File Error
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFInfo = The JSF
- // file is not existed.
- EditorPlugin.getAlerts().error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle",
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFInfo",
- pagePath);
- }
- }
-
- /**
- * Executes the OpenEditorCommand and opens the editor
- */
- public void execute() {
- if (part.getModel() instanceof PageflowPage) {
- executeOpenPFPage();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java
deleted file mode 100644
index 921552d63..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * This is the orphan child command for pageflow container
- *
- */
-public class OrphanChildCommand extends Command {
-
- /** old location of pageflow node */
- private Point oldLocation;
-
- /** the parent pageflow */
- private Pageflow pageflow;
-
- /** the child pageflow node */
- private PageflowNode child;
-
- /** the index of pageflow nodes */
- private int index;
-
- public OrphanChildCommand() {
- // Pageflow.Commands.OrphanChildCommand.Label = Orphan Child
- super(PageflowMessages.Pageflow_Commands_OrphanChildCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- List children = pageflow.getNodes();
- index = children.indexOf(child);
- oldLocation = new Point(child.getX(), child.getY());
- pageflow.getNodes().remove(child);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- pageflow.getNodes().remove(child);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- child.setX(oldLocation.x);
- child.setY(oldLocation.y);
- pageflow.getNodes().add(index, child);
- }
-
- /**
- * set the child pageflow node
- *
- * @param child -
- * child pageflow node
- */
- public void setChild(PageflowNode child) {
- this.child = child;
- }
-
- /**
- * set the parent pageflow
- *
- * @param parent -
- * parent pageflow
- */
- public void setParent(Pageflow parent) {
- pageflow = parent;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java
deleted file mode 100644
index 2741862d8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-
-/**
- * Before the command stack called execute to do the actual model modification,
- * it will call the command's IPreExecuteCommand inteface to check the command
- * can be execute or not.
- *
- *
- * @author Xiao-guang Zhang
- */
-public class PreExecuteCommandStack extends CommandStack {
- /**
- *
- */
- public PreExecuteCommandStack() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#execute(org.eclipse.gef.commands.Command)
- */
- public void execute(Command command) {
- if (command == null || !command.canExecute()) {
- return;
- }
- if (command instanceof IPreExecuteCommand) {
- if (!((IPreExecuteCommand) command).preExecute()) {
- return;
- }
- }
- super.execute(command);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java
deleted file mode 100644
index ed0c8fa01..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-
-/**
- * Change the end of a link.
- *
- * @author hmeng
- *
- */
-public class ReconnectConnectionCommand extends ConnectionCommand {
-
- public ReconnectConnectionCommand() {
- // TODO Auto-generated constructor stub
- }
-
- public boolean canExecute() {
- // if user didn't set PFLink object beforehand, this command can't be
- // executed.
- if (link == null || link.eContainer() == null) {
- return false;
- }
-
- // Reconnect both source and target
- if (oldSource != null && source != null && oldTarget != null
- && target != null) {
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- source, target)) {
- return false;
- }
- }
-
- // Reconnect source
- if (oldSource != null && source != null) {
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- source, oldTarget)) {
- return false;
- }
- }
- // Reconnect target
- if (oldTarget != null && target != null) {
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- oldSource, target)) {
- return false;
- }
- }
-
- return true;
-
- }
-
- public void doExecute() {
- String outcome = null, action = null, largeIcon = null, smallIcon = null;
- boolean isRedirect = false;
- outcome = link.getOutcome();
- action = link.getFromaction();
- isRedirect = link.isRedirect();
- largeIcon = link.getLargeicon();
- smallIcon = link.getSmallicon();
- // It is a reconnect source command
- if (oldSource != null && source != null) {
- link.setSource(source);
- }
- // It is a reconnect target command
- if (oldTarget != null && target != null) {
- link.setTarget(target);
- }
- link.setOutcome(outcome);
- link.setFromaction(action);
- link.setLargeicon(largeIcon);
- link.setSmallicon(smallIcon);
- link.setRedirect(isRedirect);
- }
-
- public void undo() {
- if (canExecute()) {
- // It was a reconnect source command
- if (oldSource != null && source != null) {
- // The link source must be replaced by the oldSource
- if (link.getSource() != null) {
- link.getSource().getOutlinks().remove(link);
- }
- source.getOutlinks().remove(link);
- link.setSource(oldSource);
- }
- // It was a reconnect target command
- if (oldTarget != null && target != null) {
- // The link target must be replaced by the oldTarget
- if (link.getTarget() != null) {
- link.getTarget().getInlinks().remove(link);
- }
- target.getInlinks().remove(link);
- link.setTarget(oldTarget);
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java
deleted file mode 100644
index 0a2850486..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * Command to rename Node.
- *
- * @author xgzhang
- */
-public class RenameNodeCommand extends Command {
-
- /** new pageflow node */
- private PageflowNode node;
-
- /** new node name */
- private String name;
-
- /** old node name */
- private String oldName;
-
- /**
- * @see org.eclipse.gef.commands.Command#execute()
- */
- public void execute() {
- node.setName(name);
- }
-
- /**
- * Sets the new Activity name
- *
- * @param string
- * the new name
- */
- public void setName(String string) {
- name = string;
- }
-
- /**
- * Sets the old Activity name
- *
- * @param string
- * the old name
- */
- public void setOldName(String string) {
- oldName = string;
- }
-
- /**
- * Sets the source Activity
- *
- * @param activity
- * the source Activity
- */
- public void setSource(PageflowNode node) {
- this.node = node;
- }
-
- /**
- * @see org.eclipse.gef.commands.Command#undo()
- */
- public void undo() {
- node.setName(oldName);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java
deleted file mode 100644
index 1d90a740f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-
-/**
- * This is the SetConstraint command for XY layout edit policy
- *
- */
-public class SetConstraintCommand extends Command {
- /** location command label */
- private static final String COMMAND_LABEL_LOCATION = "change location command";
-
- /** resize command label */
- private static final String COMMAND_LABEL_RESIZE = "resize command";
-
- /** new position */
- private Point newPos;
-
- /** new size */
- private Dimension newSize;
-
- /** olde position */
- private Point oldPos;
-
- /** old size */
- private Dimension oldSize;
-
- /** pageflow element */
- private PageflowElement part;
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- oldSize = new Dimension(part.getWidth(), part.getHeight());
- oldPos = new Point(part.getX(), part.getY());
- part.setX(newPos.x);
- part.setY(newPos.y);
- part.setHeight(newSize.height);
- part.setWidth(newSize.width);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- part.setX(newPos.x);
- part.setY(newPos.y);
- part.setHeight(newSize.height);
- part.setWidth(newSize.width);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- part.setX(oldPos.x);
- part.setY(oldPos.y);
- part.setHeight(oldSize.height);
- part.setWidth(oldSize.width);
- }
-
- /**
- * return the label of the constaints
- */
- public String getLabel() {
- if (oldSize.equals(newSize)) {
- return COMMAND_LABEL_LOCATION;
- }
- return COMMAND_LABEL_RESIZE;
- }
-
- /**
- * set the new location using rectangle
- *
- * @param r -
- * new location
- */
- public void setLocation(Rectangle r) {
- setLocation(r.getLocation());
- setSize(r.getSize());
- }
-
- /**
- * set the new location using point
- *
- * @param p -
- * new location point
- */
- public void setLocation(Point p) {
- newPos = p;
- }
-
- /**
- * set the pageflow element
- *
- * @param part -
- * pageflow element
- */
- public void setPart(PageflowElement part) {
- this.part = part;
- }
-
- /**
- * set the new size
- *
- * @param p -
- * new size
- */
- public void setSize(Dimension p) {
- newSize = p;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java
deleted file mode 100644
index 083c65edc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SimpleLoweredBorder;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * This RootEditPart can set its own's background, fourground color, and font.
- * All this properties can be changed.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class ConfigurableRootEditPart extends ScalableFreeformRootEditPart
- implements IFigurePreference {
- /**
- *
- */
- public ConfigurableRootEditPart() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- IFigure fig = super.createFigure();
- fig.setOpaque(true);
- fig.setBorder(new SimpleLoweredBorder());
- return fig;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- getFigure().setForegroundColor(c);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- getFigure().setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- getFigure().setFont(f);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java
deleted file mode 100644
index 05f234a5a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * CellEditorLocator for Pageflow Node.
- *
- * @author - Xiaoguang Zhang
- */
-public class DirectEditCellEditorLocator implements CellEditorLocator {
- /** the source label */
- private Label label;
-
- /**
- * Creates a new DirectEditCellEditorLocator for the given Label
- *
- * @param label
- * the Label
- */
- public DirectEditCellEditorLocator(Label label) {
- setLabel(label);
- }
-
- /*
- * (non-javadoc)
- *
- * @see CellEditorLocator#relocate(CellEditor)
- */
- public void relocate(CellEditor celleditor) {
- Text text = (Text) celleditor.getControl();
- Point pref = text.computeSize(-1, -1);
- // get the label's boundary
- Rectangle rect = label.getTextBounds().getCopy();
- label.translateToAbsolute(rect);
-
- // because the label can be empty and the size is too small
- // here get the prefered text size according to label's size and default
- // size.
- int width, height;
- if (pref.x > rect.width) {
- width = pref.x;
- } else {
- width = rect.width;
- }
-
- if (pref.y > rect.height) {
- height = pref.y;
- } else {
- height = rect.height;
- }
-
- // set the boundary of the text control
- text.setBounds(rect.x - 1, rect.y - 1, width + 1, height + 1);
- }
-
- /**
- * Returns the Label figure.
- *
- * @return the Label
- */
- protected Label getLabel() {
- return label;
- }
-
- /**
- * Sets the label.
- *
- * @param label
- * The label to set
- */
- protected void setLabel(Label label) {
- this.label = label;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java
deleted file mode 100644
index 501ff47e3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.source.Annotation;
-
-/**
- * Edit part's Annotation interface
- *
- * @author Xiao-guang Zhang
- *
- */
-public interface IAnnotationEditPart {
- /**
- * decorate current Edit Part.
- *
- */
- void addAnnotation(Annotation annotation);
-
- /**
- * un-decorate current EditPart
- *
- */
- void removeAnnotation();
-
- /**
- * get the maker's resource instance.
- *
- * @return
- */
- IResource getMarkerResource();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java
deleted file mode 100644
index 8ff1b9a99..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.swt.graphics.Color;
-
-/**
- * This interface can be used to set Connection's preference
- *
- * @author Xiaoguang Zhang
- *
- */
-public interface IConnectionPreference extends IFigurePreference {
-
- /**
- * set the connection line width
- *
- * @param w
- */
- void setLineWidth(int w);
-
- /**
- * set the label visible or not
- *
- * @param b
- */
- void setLabelVisible(boolean b);
-
- /**
- * set the label's foreground color
- *
- * @param c
- */
- void setLabelForegroundColor(Color c);
-
- /**
- * set the label's background color
- *
- * @param c
- */
- void setLabelBackgroundColor(Color c);
-
- /**
- * set the connection router's style, it can be LINE_ROUTING_MANUAL,
- * LINE_ROUTING_MANHATTAN
- *
- * @param style -
- * The new connection router's style
- */
- void setConnectionRouterStyle(int style);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java
deleted file mode 100644
index 3dc924b1e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * This interface can be implemented to set the figure's preferences
- *
- * @author Xiao-guang Zhang
- *
- */
-public interface IFigurePreference {
- /**
- * Sets the foreground color.
- *
- * @param c
- * The new foreground color
- */
- void setForegroundColor(Color c);
-
- /**
- * Sets the background color.
- *
- * @param c
- * The new background color
- */
- void setBackgroundColor(Color c);
-
- /**
- * sets the new font
- *
- * @param f
- */
- void setFont(Font f);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java
deleted file mode 100644
index 7bc5d52fc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * LayerPane has muliple layers, this interface will be used to set different
- * layer's style.
- *
- * @author Xiao-guang Zhang
- *
- */
-public interface ILayerPanePreference extends IFigurePreference {
- public static int LINE_ROUTING_MANUAL = 0;
-
- public static int LINE_ROUTING_MANHATTAN = 1;
-
- /**
- * sets the grid to be shown or not
- *
- * @param bVisible
- */
- void setGridVisible(boolean bVisible);
-
- /**
- * sets the grid's dimension
- *
- * @param d
- * The new grid spacing
- */
- void setGridSpacing(Dimension d);
-
- /**
- * set the grid's foregoundColor
- *
- * @param c -
- * The new foreground color
- */
- void setGridForegroundColor(Color c);
-
- /**
- * set the connection router's style, it can be LINE_ROUTING_MANUAL,
- * LINE_ROUTING_MANHATTAN
- *
- * @param style -
- * The new connection router's style
- */
- void setConnectionRouterStyle(int style);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java
deleted file mode 100644
index dc2c679b5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.PositionConstants;
-
-/**
- * This interface can be used to set NodeEditPart's preference
- *
- * @author Xiaoguang Zhang
- *
- */
-
-public interface INodePreference extends IFigurePreference {
-
- /**
- * Sets the text placement of the label relative to its icon. The default is
- * {@link PositionConstants#EAST}. Other possible values are
- * {@link PositionConstants#NORTH}, {@link PositionConstants#SOUTH} and
- * {@link PositionConstants#WEST}.
- *
- * @param where
- * the text placement
- */
- void setTextPlacement(int where);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java
deleted file mode 100644
index fa9422694..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-/**
- * @author hmeng
- */
-
-public interface PFValidator {
- void validate();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java
deleted file mode 100644
index 18337a4d3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowContainerEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowXYLayoutEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-
-/**
- * abstract class for pageflow container.
- */
-abstract public class PageflowContainerEditPart extends PageflowElementEditPart {
-
- /**
- * @param element -
- * pageflow model.
- */
- public PageflowContainerEditPart(PageflowElement element) {
- super(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- installEditPolicy(EditPolicy.CONTAINER_ROLE,
- new PageflowContainerEditPolicy());
- installEditPolicy(EditPolicy.LAYOUT_ROLE,
- new PageflowXYLayoutEditPolicy());
- }
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#notifyChanged(Notification)
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
-
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- refreshChildren();
- break;
- case Notification.SET:
- refreshVisuals();
- break;
- }
- super.notifyChanged(notification);
- }
- };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java
deleted file mode 100644
index 7c40d67fd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * DirectEditManager for Pageflow node
- *
- * @author - Xiaoguang Zhang
- */
-public class PageflowDirectEditManager extends DirectEditManager {
- /** text font */
- protected Font scaledFont;
-
- /** verify listener for the text control */
- protected VerifyListener verifyListener;
-
- /** the direct editor's parent label. */
- protected Label label;
-
- /**
- * Creates a new PageflowDirectEditManager with the given attributes.
- *
- * @param source
- * the source EditPart
- * @param editorType
- * type of editor
- * @param locator
- * the CellEditorLocator
- */
- public PageflowDirectEditManager(GraphicalEditPart source,
- Class editorType, CellEditorLocator locator, Label label) {
- super(source, editorType, locator);
- this.label = label;
- }
-
- /*
- * (non-javadoc)
- *
- * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
- */
- protected void bringDown() {
- // This method might be re-entered when super.bringDown() is called.
- Font disposeFont = scaledFont;
- scaledFont = null;
- super.bringDown();
- if (disposeFont != null) {
- disposeFont.dispose();
- }
- }
-
- /*
- * (non-javadoc)
- *
- * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
- */
- protected void initCellEditor() {
- Text text = (Text) getCellEditor().getControl();
- verifyListener = new VerifyListener() {
- public void verifyText(VerifyEvent event) {
- Text text = (Text) getCellEditor().getControl();
- String oldText = text.getText();
- // get the left string of the new input character
- String leftText = oldText.substring(0, event.start);
- // get the right string of the new input charactor
- String rightText = oldText.substring(event.end, oldText
- .length());
-
- GC gc = new GC(text);
- Point size = gc.textExtent(leftText + event.text + rightText);
- gc.dispose();
- if (size.x != 0) {
- size = text.computeSize(size.x, SWT.DEFAULT);
- }
- getCellEditor().getControl().setSize(size.x, size.y);
- }
- };
- text.addVerifyListener(verifyListener);
-
- // set the initial text, font, to the direct editor
- String initialLabelText = label.getText();
- getCellEditor().setValue(initialLabelText);
- IFigure figure = ((GraphicalEditPart) getEditPart()).getFigure();
- scaledFont = figure.getFont();
- FontData data = scaledFont.getFontData()[0];
- Dimension fontSize = new Dimension(0, data.getHeight());
- label.translateToAbsolute(fontSize);
- data.setHeight(fontSize.height);
- scaledFont = new Font(null, data);
-
- text.setFont(scaledFont);
- text.selectAll();
- }
-
- /*
- * (non-javadoc)
- *
- * @see org.eclipse.gef.tools.DirectEditManager#unhookListeners()
- */
- protected void unhookListeners() {
- super.unhookListeners();
- Text text = (Text) getCellEditor().getControl();
- text.removeVerifyListener(verifyListener);
- verifyListener = null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java
deleted file mode 100644
index 2d1f6ced3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FanRouter;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ManhattanConnectionRouter;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.CompoundSnapToHelper;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.SnapToGeometry;
-import org.eclipse.gef.SnapToGrid;
-import org.eclipse.gef.SnapToGuides;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.gef.editparts.GridLayer;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.gef.editpolicies.SnapFeedbackPolicy;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * The container editr part for the whole pageflow, which uses the
- * WindowFigure(GEM) as the container figure.
- *
- */
-public class PageflowEditPart extends PageflowContainerEditPart implements
- LayerConstants, ILayerPanePreference {
- /** The seperation for the two possible coincided connections */
- private static final int CONNECTION_SEPERATION = 20;
-
- private int connectionStyle = -1;
-
- /**
- * Creates a new PageflowEditPart instance.
- *
- * @param element -
- * pageflow model
- */
- protected PageflowEditPart(Pageflow pageflow) {
- super((PageflowElement) pageflow);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- FreeformLayer layer = new FreeformLayer();
- // layer.setOpaque(true);
- layer.setLayoutManager(new FreeformLayout());
- return layer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- super.createEditPolicies();
-
- installEditPolicy(EditPolicy.NODE_ROLE, null);
- installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, null);
- // installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
- installEditPolicy(EditPolicy.COMPONENT_ROLE,
- new RootComponentEditPolicy());
- installEditPolicy("Snap Feedback", new SnapFeedbackPolicy()); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class key) {
- if (key == SnapToHelper.class) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
-
- List snapStrategies = new ArrayList();
- Boolean bRulerVisible = (Boolean) getViewer().getProperty(
- RulerProvider.PROPERTY_RULER_VISIBILITY);
- if (bRulerVisible != null && bRulerVisible.booleanValue()) {
- snapStrategies.add(new SnapToGuides(this));
- }
-
- boolean bSnapToGeometry = store
- .getBoolean(GEMPreferences.SNAP_TO_GEOMETRY);
- if (bSnapToGeometry) {
- snapStrategies.add(new SnapToGeometry(this));
- }
- boolean bSnapToGrid = store.getBoolean(GEMPreferences.SNAP_TO_GRID);
- if (bSnapToGrid) {
- snapStrategies.add(new SnapToGrid(this));
- }
-
- if (snapStrategies.size() == 0) {
- return null;
- }
- if (snapStrategies.size() == 1) {
- return (SnapToHelper) snapStrategies.get(0);
- }
-
- SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()];
- for (int i = 0; i < snapStrategies.size(); i++) {
- ss[i] = (SnapToHelper) snapStrategies.get(i);
- }
- return new CompoundSnapToHelper(ss);
- }
- return super.getAdapter(key);
- }
-
- /**
- * Returns the Pageflow.
- *
- * @return the pageflow
- */
- public Pageflow getPageflow() {
- return (Pageflow) getPageflowElement();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#getModelChildren()
- */
- protected List getModelChildren() {
- List allChildren = new LinkedList();
- Iterator it;
-
- it = getPageflow().getNodes().iterator();
- while (it.hasNext()) {
- allChildren.add(it.next());
- }
-
- return allChildren;
- }
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see Adapter#notifyChanged(Notification)
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
-
- // int featureId = notification.getFeatureID(
- // PageflowPackage.class );
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- refreshChildren();
- break;
-
- case Notification.SET:
- refreshChildren();
- refreshVisuals();
- break;
- case FC2PFTransformer.MY_NOTIFICATION_TYPE1:
- restore((Pageflow) getModel());
- refreshChildren();
- refreshVisuals();
- break;
- // restore all children
- case FC2PFTransformer.MY_NOTIFICATION_TYPE:
- // stop all children
- postPone((Pageflow) getModel());
- break;
- }
- }
-
- protected void restore(Pageflow pageflow) {
- TreeIterator nodes;
- // restore
- nodes = pageflow.eAllContents();
- while (nodes.hasNext()) {
- setPostpone((EObject) nodes.next(), false);
- }
- setPostpone(pageflow, false);
- }
-
- void setPostpone(EObject node, boolean enable) {
- List adapters = node.eAdapters();
- for (int i = 0; i < adapters.size(); i++) {
- if (adapters.get(i) instanceof PFBatchAdapter) {
- ((PFBatchAdapter) adapters.get(i))
- .setNeedPostpone(enable);
- }
- }
- }
-
- protected void postPone(Pageflow pageflow) {
- TreeIterator nodes;
- // postpone
- nodes = pageflow.eAllContents();
- while (nodes.hasNext()) {
- setPostpone((EObject) nodes.next(), true);
- }
- setPostpone(pageflow, true);
- }
-
- };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- super.refreshVisuals();
- for (int i = 0; i < this.getChildren().size(); i++) {
- ((AbstractEditPart) getChildren().get(i)).refresh();
- }
- ConnectionLayer cLayer = (ConnectionLayer) getLayer(CONNECTION_LAYER);
-
- if (cLayer.getConnectionRouter() == null) {
- setConnectionRouterStyle(getConnectionRouterStyle());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractEditPart#refreshChildren()
- */
- protected void refreshChildren() {
- super.refreshChildren();
- PageflowAnnotationUtil.validatePageflow(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- getFigure().setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.ILayerPanePreference#setConnectionRouterStyle(int)
- */
- public void setConnectionRouterStyle(int style) {
- connectionStyle = style;
- ConnectionLayer cLayer = (ConnectionLayer) getLayer(CONNECTION_LAYER);
- if (style == ILayerPanePreference.LINE_ROUTING_MANHATTAN) {
- FanRouter router = new FanRouter();
- router.setSeparation(CONNECTION_SEPERATION);
- router.setNextRouter(new ManhattanConnectionRouter());
- cLayer.setConnectionRouter(router);
- } else if (style == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- FanRouter router = new FanRouter();
- router.setSeparation(CONNECTION_SEPERATION);
- router.setNextRouter(new BendpointConnectionRouter());
- cLayer.setConnectionRouter(router);
- }
- }
-
- /**
- * get the foreground color from preference
- *
- */
- public int getConnectionRouterStyle() {
- if (this.connectionStyle == -1) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- String connectionStyle = store
- .getString(GEMPreferences.LINE_ROUTING);
-
- if (GEMPreferences.LINE_ROUTING_MANHATTAN.equals(connectionStyle)) {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANHATTAN;
- } else {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANUAL;
- }
- }
- return this.connectionStyle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- getFigure().setForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- // getLayer(PRIMARY_LAYER).setOpaque(true);
- getLayer(PRIMARY_LAYER).setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setGridVisible(boolean)
- */
- public void setGridVisible(boolean bVisible) {
- GridLayer gl = (GridLayer) getLayer(GRID_LAYER);
- gl.setVisible(bVisible);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setGridSpacing(org.eclipse.draw2d.geometry.Dimension)
- */
- public void setGridSpacing(Dimension d) {
- GridLayer gl = (GridLayer) getLayer(GRID_LAYER);
- gl.setSpacing(d);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.ILayerPanePreference#setGridForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setGridForegroundColor(Color c) {
- GridLayer gl = (GridLayer) getLayer(GRID_LAYER);
- gl.setForegroundColor(c);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java
deleted file mode 100644
index fe5723589..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- *
- * Edit part factory to create different pageflow elements.
- *
- *
- */
-public class PageflowEditPartsFactory implements EditPartFactory {
- /*
- * (non-Javadoc)
- *
- * @see EditPartFactory#createEditPart(EditPart, Object)
- */
- public EditPart createEditPart(EditPart context, Object obj) {
- if (obj instanceof Pageflow) {
- return new PageflowEditPart((Pageflow) obj);
- } else if (obj instanceof PageflowNode) {
- return new PageflowNodeEditPart((PageflowNode) obj);
- } else if (obj instanceof PageflowLink) {
- return new PageflowLinkEditPart((PageflowLink) obj);
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java
deleted file mode 100644
index fb5538e93..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowElementPropertySource;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- *
- *
- * <code>PageflowElementEditPart</code> is the base class for all the
- * EditParts in the application, whose model is a subclass of PageflowElement.
- * This class maintains the figure's size and location inresponse to changes in
- * the model, and registers as a listener on its model using the
- * <code>org.eclipse.emf.common.notify.Adapter</code> interface
- */
-public abstract class PageflowElementEditPart extends AbstractGraphicalEditPart
- implements IAnnotationEditPart {
- /** image description for different edit part */
- public static final ImageDescriptor IMG_ACTION = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Action16.gif"); //$NON-NLS-1$
-
- protected Adapter adapter;
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#notifyChanged()
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
- int featureId = notification
- .getFeatureID(PageflowPackage.class);
- if (type == Notification.SET) {
- switch (featureId) {
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- refreshVisuals();
- break;
- }
- }
- };
- };
- }
-
- public static final ImageDescriptor IMG_PAGE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Page.gif"); //$NON-NLS-1$
-
- public static final ImageDescriptor IMG_NODE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/FacesConfig_Pageflow16.gif"); //$NON-NLS-1$
-
- /** property source of the pageflow element */
- private IPropertySource propertySource = null;
-
- private Image image = null;
-
- protected PageflowElementEditPart(PageflowElement element) {
- setModel(element);
- }
-
- /**
- * Returns the image for the pageflow element.
- *
- * @param element -
- * pageflow element
- * @return - the image for the pageflow element.
- */
- public Image getImage(PageflowElement element) {
- if (image == null) {
- ImageDescriptor imageDescriptor = null;
-
- if (element instanceof PageflowPage) {
- imageDescriptor = IMG_PAGE;
- } else {
- imageDescriptor = IMG_NODE;
- }
-
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
- }
-
- return image;
- }
-
- /**
- * get the type name of the pageflow element
- *
- * @param element -
- * pageflow element
- * @return - the type name of the pageflow element
- */
- public static String getTypeName(PageflowElement element) {
- if (element instanceof Pageflow) {
- return "Pageflow"; //$NON-NLS-1$
- } else if (element instanceof PageflowPage) {
- return "Page"; //$NON-NLS-1$
- }
-
- return "[unknown]"; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#activate()
- */
- public void activate() {
- if (isActive()) {
- return;
- }
-
- // start listening for changes in the model
- hookIntoPageflowElement(getPageflowElement());
-
- super.activate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#deactivate()
- */
- public void deactivate() {
- if (!isActive()) {
- return;
- }
-
- // stop listening for changes in the model
- unhookFromPageflowElement(getPageflowElement());
-
- super.deactivate();
- }
-
- /**
- * Returns the model as pageflow element.
- *
- * @return - pageflow element
- */
- public PageflowElement getPageflowElement() {
- return (PageflowElement) getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- if (getParent() != null) {
- Point loc = new Point(getPageflowElement().getX(),
- getPageflowElement().getY());
- Dimension size = new Dimension(getPageflowElement().getWidth(),
- getPageflowElement().getHeight());
- Rectangle r = new Rectangle(loc, size);
-
- ((GraphicalEditPart) getParent()).setLayoutConstraint(this,
- getFigure(), r);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class key) {
- /*
- * override the default behavior defined in AbstractEditPart which would
- * expect the model to be a property sourced. instead the editpart can
- * provide a property source
- */
- if (key == IPropertySource.class) {
- return getPropertySource();
- }
- if (key == Adapter.class) {
- if (adapter == null) {
- adapter = createEMFAdapter();
- }
- return adapter;
- }
- return super.getAdapter(key);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#getPropertySource()
- */
- protected IPropertySource getPropertySource() {
- if (propertySource == null) {
- propertySource = new PageflowElementPropertySource(
- getPageflowElement());
- }
- return propertySource;
- }
-
- /**
- * Registers this edit part as a listener for change notifications to the
- * specified pageflow element.
- *
- * @param element
- * the pagelfow element that should be observed for change
- * notifications
- */
- protected void hookIntoPageflowElement(PageflowElement element) {
- if (null != element) {
- if (!element.eAdapters().contains(getAdapter(Adapter.class))) {
- element.eAdapters().add(getAdapter(Adapter.class));
- }
- }
- }
-
- /**
- * Removes this edit part from the specified pageflow element. Thus, it will
- * no longe receive change notifications.
- *
- * @param element
- * the pagelfow element that should not be observed any more
- */
- protected void unhookFromPageflowElement(PageflowElement element) {
- if (null != element) {
- element.eAdapters().remove(getAdapter(Adapter.class));
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- IFigure figure = null;
- figure = new PageflowNodeFigure();
- PageflowElement elm = getPageflowElement();
- if (elm.getName() != null) {
- ((PageflowNodeFigure) figure).setImageText(getImage(elm), elm
- .getName());
- } else {
- ((PageflowNodeFigure) figure).setImageText(getImage(elm),
- getTypeName(elm));
- }
- ((PageflowNodeFigure) figure).update();
- return figure;
- }
-
- /**
- * perform corresponding request related with double click or direct edit
- * click.
- *
- * @param request :
- * request composed by mouse click.
- */
- public void performRequest(Request request) {
- // the request is triggered by double clicked on a edit part
- if (request.getType() == RequestConstants.REQ_OPEN) {
- performOpen();
- } else if (request.getType() == RequestConstants.REQ_DIRECT_EDIT) {
- performDirectEdit();
- }
- }
-
- /**
- * perfrom direct edit request
- *
- */
- protected void performDirectEdit() {
- }
-
- /**
- * perform double click request
- *
- */
- protected void performOpen() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public void addAnnotation(Annotation annotation) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public void removeAnnotation() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.marker.IEditPartMarker#getMarkerResource()
- */
- public IResource getMarkerResource() {
- IResource resource = WebrootUtil.getResource((EObject) getModel());
- ;
- return resource;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java
deleted file mode 100644
index ca0c32895..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowElementPropertySource;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * This is the abstract base <code>TreeEditPart</code> for pageflow elements.
- */
-public class PageflowElementTreeEditPart extends AbstractTreeEditPart implements
- Adapter {
- /** Image descriptor of tree item for the different edit parts */
- public static final ImageDescriptor IMG_PAGE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Page16.gif"); //$NON-NLS-1$
-
- public static final ImageDescriptor IMG_NODE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/FacesConfig_Pageflow16.gif"); //$NON-NLS-1$
-
- /** Property resource for shared property view */
- private IPropertySource propertySource = null;
-
- /** notifer to pageflow element */
- private Notifier target = null;
-
- /**
- * Returns the image for the pageflow element.
- *
- * @param element -
- * pageflow element, such as Begin, End, Page, and Action.
- * @return - the image for the pageflow element
- */
- public static Image getImage(PageflowElement element) {
- ImageDescriptor imageDescriptor = null;
-
- if (element instanceof PageflowPage) {
- imageDescriptor = IMG_PAGE;
- } else {
- imageDescriptor = IMG_NODE;
- }
-
- if (null == imageDescriptor) {
- return null;
- }
-
- Image image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
-
- return image;
- }
-
- /**
- * Creates a new PageflowElementTreeEditPart instance.
- *
- * @param pageflowElement -
- * create a new edit part according to the pageflow model
- */
- public PageflowElementTreeEditPart(PageflowElement pageflowElement) {
- super(pageflowElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class key) {
- /*
- * override the default behavior defined in AbstractEditPart which would
- * expect the model to be a property sourced. instead the editpart can
- * provide a property source
- */
- if (key == IPropertySource.class) {
- return getPropertySource();
- }
- return super.getAdapter(key);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTreeEditPart#getImage()
- */
- protected Image getImage() {
- return getImage(getPageflowElement());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#getPropertySource()
- */
- protected IPropertySource getPropertySource() {
- if (propertySource == null) {
- propertySource = new PageflowElementPropertySource(
- getPageflowElement());
- }
- return propertySource;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#getTarget()
- */
- public Notifier getTarget() {
- return target;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTreeEditPart#getText()
- */
- protected String getText() {
- return (null != getPageflowElement().getName() ? getPageflowElement()
- .getName() : "[unnamed]"); //$NON-NLS-1$
- }
-
- /**
- * Returns the model as <code>PageflowElement</code>.
- *
- * @return - the model as <code>PageflowElement</code>
- */
- public PageflowElement getPageflowElement() {
- return (PageflowElement) getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#isAdapterForType(Object)
- */
- public boolean isAdapterForType(Object type) {
- return type.equals(getModel().getClass());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#notifyChanged(Notification)
- */
- public void notifyChanged(Notification notification) {
- int type = notification.getEventType();
-
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- refreshChildren();
- break;
-
- case Notification.SET:
- refreshVisuals();
- break;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#setTarget(Notifier)
- */
- public void setTarget(Notifier newTarget) {
- target = newTarget;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#activate()
- */
- public void activate() {
- if (isActive())
- return;
-
- // start listening for changes in the model
- hookIntoPageflowElement(getPageflowElement());
-
- super.activate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#deactivate()
- */
- public void deactivate() {
- if (!isActive())
- return;
-
- // stop listening for changes in the model
- unhookFromPageflowElement(getPageflowElement());
-
- super.deactivate();
- }
-
- /**
- * Registers this edit part as a listener for change notifications to the
- * specified pageflow element.
- *
- * @param element -
- * the pagelfow element that should be observed for change
- * notifications
- */
- protected void hookIntoPageflowElement(PageflowElement element) {
- if (null != element) {
- element.eAdapters().add(this);
- }
- }
-
- /**
- * Removes this edit part from the specified pageflow element. Thus, it will
- * no longe receive change notifications.
- *
- * @param element
- * -the pagelfow element that should not be observed
- */
- protected void unhookFromPageflowElement(PageflowElement element) {
- if (null != element) {
- element.eAdapters().remove(this);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java
deleted file mode 100644
index 979190b40..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java
+++ /dev/null
@@ -1,474 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RelativeBendpoint;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PFLinkBendpointEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PFLinkEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PFLinkEndpointEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PFLinkFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowLinkPropertySource;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * <code>PFLinkEditPart</code> is the EditPart for PFLink model elements. The
- * figure for this EditPart is simply a PolylineConnection. Because both
- * AbstractConnectionEditPart and the Adapter interface have a getTarget method,
- * we use an inner class to implement the Adapter interface in order to work
- * around the name collision.
- *
- *
- */
-public class PageflowLinkEditPart extends AbstractConnectionEditPart implements
- IConnectionPreference, IAnnotationEditPart, PFValidator {
- /** adapter for notification */
- private PFLinkAdapter adapter = new PFLinkAdapter();
-
- /** property source of the pflink */
- private IPropertySource propertySource = null;
-
- /** image description for different edit part */
- public static final ImageDescriptor IMG_WARNING = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Quickfix_Error.gif");
-
- private int connectionStyle = -1;
-
- private PFLinkBendpointEditPolicy bendpointEditPolicy;
-
- /**
- * @param element
- */
- public PageflowLinkEditPart(PageflowLink element) {
- super();
- // element.getPageflow()
- setModel(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- IFigure figure = new PFLinkFigure();
- return figure;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
- new PFLinkEndpointEditPolicy());
-
- if (getConnectionRouterStyle() == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
- getBendpointEditPolicy());
- }
- PFLinkEditPolicy policy = new PFLinkEditPolicy();
- // policy.setSseModel(model);
- installEditPolicy(EditPolicy.CONNECTION_ROLE, new PFLinkEditPolicy());
-
- }
-
- private PFLinkBendpointEditPolicy getBendpointEditPolicy() {
- if (bendpointEditPolicy == null) {
- bendpointEditPolicy = new PFLinkBendpointEditPolicy();
- }
- return bendpointEditPolicy;
- }
-
- public PageflowLink getPFLink() {
- return (PageflowLink) getModel();
- }
-
- private class PFLinkAdapter extends PFBatchAdapter {
- private Notifier _newTarget = null;
-
- // private IPropertySource _propertySource = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#getTarget()
- */
- public Notifier getTarget() {
- return _newTarget;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return getModel().getClass() == type;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
- int featureId = notification.getFeatureID(PageflowPackage.class);
- // FC2PFTransformer.getInstance().NotifyChanged(notification,
- // getPFLink());
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.SET:
- if (featureId == PageflowPackage.PF_LINK__OUTCOME
- || featureId == PageflowPackage.PF_LINK__SOURCE
- || featureId == PageflowPackage.PF_LINK__TARGET) {
- PageflowAnnotationUtil
- .validateLink(PageflowLinkEditPart.this);
- }
-
- refreshVisuals();
- break;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
- */
- public void setTarget(Notifier newTarget) {
- this._newTarget = newTarget;
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditPart#activate()
- */
- public void activate() {
- getPFLink().eAdapters().add(adapter);
- PageflowLink element = (PageflowLink) getModel();
- super.activate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditPart#deactivate()
- */
- public void deactivate() {
- // getPFLink().eAdapters().remove(adapter);
- // PageflowLink element = (PageflowLink) getModel();
- // NavigationCaseType navCase = ((NavigationCaseType) element
- // .getFCElements().getData().get(0));
- // navCase.eAdapters().remove(fcAdapter);
- // TreeIterator iterator = navCase.eAllContents();
- // while (iterator.hasNext()) {
- // ((EObject) iterator.next()).eAdapters().remove(fcAdapter);
- // }
-
- super.deactivate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class key) {
- /*
- * override the default behavior defined in AbstractEditPart which would
- * expect the model to be a property sourced. instead the editpart can
- * provide a property source
- */
- if (key == IPropertySource.class) {
- return getPropertySource();
- }
- return super.getAdapter(key);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#getPropertySource()
- */
- protected IPropertySource getPropertySource() {
- if (propertySource == null) {
- propertySource = new PageflowLinkPropertySource(getPFLink());
- }
- return propertySource;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- super.refreshVisuals();
- resetLabel();
- if (getConnectionRouterStyle() == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- refreshBendpoints();
- }
- }
-
- /**
- * set the bendpoint constraints of the pflink connection
- *
- */
- protected void refreshBendpoints() {
- // bendpoints stored in pflink
- List modelConstraint = getPFLink().getBendPoints();
- // bendpoint constraint list
- List figureConstraint = new ArrayList();
- for (int i = 0; i < modelConstraint.size(); i++) {
- PageflowLinkBendpoint wbp = (PageflowLinkBendpoint) modelConstraint
- .get(i);
- RelativeBendpoint rbp = new RelativeBendpoint(getConnectionFigure());
- rbp.setRelativeDimensions(wbp.getFirstRelativeDimension(), wbp
- .getSecondRelativeDimension());
- rbp.setWeight((i + 1) / ((float) modelConstraint.size() + 1));
- figureConstraint.add(rbp);
- }
- // set the router constaints.
- getConnectionFigure().setRoutingConstraint(figureConstraint);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLineWidth(int)
- */
- public void setLineWidth(int w) {
- ((PFLinkFigure) getFigure()).setLineWidth(w);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLabelVisible(boolean)
- */
- public void setLabelVisible(boolean b) {
- ((PFLinkFigure) getFigure()).setLabelVisible(b);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setForegroundColor(c);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- ((PFLinkFigure) getFigure()).setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLabelForeground(org.eclipse.swt.graphics.Color)
- */
- public void setLabelForegroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setLabelForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLabelBackground(org.eclipse.swt.graphics.Color)
- */
- public void setLabelBackgroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setLabelBackgroundColor(c);
- }
-
- private boolean needDrawingLabel() {
- return (((PageflowLink) getModel()).getOutcome() != null && ((PageflowLink) getModel())
- .getOutcome().trim().length() > 0);
- }
-
- private boolean needDrawingAction() {
- return (((PageflowLink) getModel()).getFromaction() != null && ((PageflowLink) getModel())
- .getFromaction().trim().length() > 0);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public void addAnnotation(final Annotation annotation) {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- ((PFLinkFigure) getFigure()).setImage(getImage(IMG_WARNING));
- ((PFLinkFigure) getFigure()).setToolTipText(annotation
- .getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public void removeAnnotation() {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- ((PFLinkFigure) getFigure()).clearIcon();
- resetLabel();
- }
- });
- }
-
- public void resetLabel() {
- String tip = "";
- if (needDrawingAction()) {
- ((PFLinkFigure) getFigure()).setActionImage();
- tip = "fromAction:(" + ((PageflowLink) getModel()).getFromaction()
- + ") ";
- } else if (((PFLinkFigure) getFigure()).getImage() != getImage(IMG_WARNING)) {
- ((PFLinkFigure) getFigure()).clearIcon();
- tip = "";
- }
- if (needDrawingLabel()) {
- ((PFLinkFigure) getFigure()).setLabel(((PageflowLink) getModel())
- .getOutcome());
- tip += "fromOutcome:(";
- tip += ((PageflowLink) getModel()).getOutcome() + ")";
- } else {
- ((PFLinkFigure) getFigure()).clearOutcome();
- }
- ((PFLinkFigure) getFigure()).setToolTipText(tip);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.marker.IEditPartMarker#getMarkerResource()
- *
- */
- public IResource getMarkerResource() {
- // IResource resource = null;
- // if (getModel() instanceof PFLink)
- // {
- // resource =
- // FacesConfigUtil.getFacesConfigResource(((PFLink)getModel()).getPageflow());
- // }
- // FIXME: it should be changed to link to faces-config file.
- IResource resource = WebrootUtil.getResource((EObject) getModel());
- return resource;
- }
-
- public static Image getImage(ImageDescriptor imageDescriptor) {
- Image image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
-
- return image;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setConnectionRouterStyle(int)
- */
- public void setConnectionRouterStyle(int style) {
- connectionStyle = style;
- if (getConnectionRouterStyle() == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
- getBendpointEditPolicy());
- refreshVisuals();
- } else {
- removeEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE);
- refreshVisuals();
- }
-
- }
-
- /**
- * get the foreground color from preference
- *
- */
- public int getConnectionRouterStyle() {
- if (this.connectionStyle == -1) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- String connectionStyle = store
- .getString(GEMPreferences.LINE_ROUTING);
-
- if (GEMPreferences.LINE_ROUTING_MANHATTAN.equals(connectionStyle)) {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANHATTAN;
- } else {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANUAL;
- }
- }
- return this.connectionStyle;
- }
-
- public void validate() {
- PageflowAnnotationUtil.validateLink(this);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java
deleted file mode 100644
index d9a576fa9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jdt.internal.ui.viewsupport.ImageImageDescriptor;
-import org.eclipse.jdt.ui.JavaElementImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.OpenEditorCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowElementEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowNodeDirectEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowNodeEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.ILabelDecorator;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The base class for the applications EditParts that represent
- * PageflowNode-derived objects in the model. This class implements the
- * NodeEditPart interface which supports:
- * <ul>
- * <li>feedback for Connections when they are being
- * <li>
- * <li>initially connected and when they are disonnected/reconnected</li>
- * </ul>
- *
- *
- */
-public class PageflowNodeEditPart extends PageflowElementEditPart implements
- NodeEditPart, INodePreference, PFValidator {
-
- /** property source of pageflow node */
- // private IPropertySource propertySource = null;
- protected DirectEditManager editManager;
-
- private class ImageDecorator implements ILabelDecorator {
- private Image decrateImage = null;
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.figures.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image,
- * java.lang.Object)
- */
- public Image decorateImage(Image image, Object element) {
- dispose();
- int adornmentFlags = computeAdornmentFlags(element);
- if (adornmentFlags != 0) {
- ImageDescriptor baseImage = new ImageImageDescriptor(image);
- org.eclipse.swt.graphics.Rectangle bounds = image.getBounds();
- decrateImage = (new JavaElementImageDescriptor(baseImage,
- adornmentFlags, new org.eclipse.swt.graphics.Point(
- bounds.width, bounds.height))).createImage();
- return decrateImage;
- }
- return image;
- }
-
- /**
- * Note: This method is for internal use only. Clients should not call
- * this method.
- */
- protected int computeAdornmentFlags(Object obj) {
- return JavaElementImageDescriptor.WARNING;
- }
-
- public void dispose() {
- if (decrateImage != null) {
- decrateImage.dispose();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.figures.ILabelDecorator#decorateText(java.lang.String,
- * java.lang.Object)
- */
- public String decorateText(String text, Object element) {
- // TODO Auto-generated method stub
- return null;
- }
-
- }
-
- public void dispose() {
- if (imageDecorator != null) {
- imageDecorator.dispose();
- }
- }
-
- private ImageDecorator imageDecorator = null;
-
- /**
- * Creates a new PageflowNodeEditPart instance.
- *
- * @param element -
- * pageflow node
- */
- public PageflowNodeEditPart(PageflowNode element) {
- super((PageflowElement) element);
- }
-
- /**
- * get the pageflow node
- *
- * @return - pageflow node
- */
- public PageflowNode getPageflowNode() {
- return (PageflowNode) getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#getModelSourceConnections()
- */
- protected List getModelSourceConnections() {
- return getPageflowNode().getOutlinks();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#getModelTargetConnections()
- */
- protected List getModelTargetConnections() {
- return getPageflowNode().getInlinks();
- }
-
- /**
- * Returns the Figure of this, as a node type figure.
- *
- * @return - Figure as a NodeFigure.
- */
- protected PageflowNodeFigure getPageflowNodeFigure() {
- return (PageflowNodeFigure) getFigure();
- }
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /**
- * when ports are added to a PageflowNode, add this EditPart as a
- * listener on the port so that it gets notified of PFLinks being
- * added or removed. When links are added or removed from a port
- * owned by the PageflowNode of this EditPart, refresh the
- * connections.
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
- // FC2PFTransformer.getInstance().NotifyChanged(notification,
- // (PageflowElement) getModel());
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- if (notification.getNewValue() instanceof PageflowLink) {
- refreshTargetConnections();
- refreshSourceConnections();
- validate();
- }
- break;
-
- case Notification.SET:
- int featureId = notification
- .getFeatureID(PageflowPackage.class);
- if (needValidation(featureId)) {
- validate();
- }
- refreshVisuals();
- break;
- }
- };
- };
- }
-
- private boolean needValidation(int featureId) {
- if (getModel() instanceof PageflowPage) {
- if (featureId == PageflowPackage.PF_PAGE__PATH) {
- return true;
- }
- }
- return false;
- }
-
- public void validate() {
- if (getModel() instanceof PageflowPage) {
- PageflowAnnotationUtil.validatePage(this);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- // install the edit policy to handle connection creation
- installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
- new PageflowNodeEditPolicy());
-
- installEditPolicy(EditPolicy.COMPONENT_ROLE,
- new PageflowElementEditPolicy());
-
- // install the direct policy
- installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
- new PageflowNodeDirectEditPolicy());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getSourceConnectionAnchor(ConnectionEditPart)
- */
- public ConnectionAnchor getSourceConnectionAnchor(
- ConnectionEditPart connection) {
- PageflowLink link = (PageflowLink) connection.getModel();
- return getPageflowNodeFigure().getSourceConnectionAnchorAt(
- new Point(link.getSource().getX(), link.getSource().getY()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getSourceConnectionAnchor(Request)
- */
- public ConnectionAnchor getSourceConnectionAnchor(Request request) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getPageflowNodeFigure().getSourceConnectionAnchorAt(pt);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getTargetConnectionAnchor(ConnectionEditPart)
- */
- public ConnectionAnchor getTargetConnectionAnchor(
- ConnectionEditPart connection) {
- PageflowLink link = (PageflowLink) connection.getModel();
- return getPageflowNodeFigure().getTargetConnectionAnchorAt(
- new Point(link.getTarget().getX(), link.getTarget().getY()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getTargetConnectionAnchor(Request)
- */
- public ConnectionAnchor getTargetConnectionAnchor(Request request) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getPageflowNodeFigure().getTargetConnectionAnchorAt(pt);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- super.refreshVisuals();
-
- getPageflowNodeFigure().setText(getPageflowNode().getName());
- }
-
- /**
- * make this a listener on its ports
- */
- public void activate() {
- super.activate();
-
- Iterator it;
-
- it = getPageflowNode().getInlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- hookIntoPageflowElement(link);
- }
-
- it = getPageflowNode().getOutlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- hookIntoPageflowElement(link);
- }
- }
-
- /**
- * remove this as a listener on its ports
- */
- public void deactivate() {
- super.deactivate();
- dispose();
- Iterator it;
-
- it = getPageflowNode().getInlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- unhookFromPageflowElement(link);
- }
-
- it = getPageflowNode().getOutlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- unhookFromPageflowElement(link);
- }
- }
-
- /**
- * perfrom direct edit request
- *
- */
- protected void performDirectEdit() {
- if (editManager == null) {
- Label l = (Label) ((PageflowNodeFigure) getFigure()).getLabel();
- editManager = new PageflowDirectEditManager(this,
- TextCellEditor.class, new DirectEditCellEditorLocator(l), l);
- }
- editManager.show();
- }
-
- /**
- * perform double click request
- *
- */
- protected void performOpen() {
- // only Page and Action support the double-click commands
- if (getModel() instanceof PageflowPage) {
- // CommandStack stack =
- // getViewer().getEditDomain().getCommandStack();
- Command command = new OpenEditorCommand(this);
- if (command != null && command.canExecute()) {
- // stack.execute(command);
- command.execute();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- getPageflowNodeFigure().setForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- getPageflowNodeFigure().setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- getPageflowNodeFigure().setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.INodePreference#setTextPlacement(int)
- */
- public void setTextPlacement(int where) {
- getPageflowNodeFigure().setTextPlacement(where);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public void addAnnotation(final Annotation annotation) {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getPageflowNodeFigure().setImage(
- getDecoratedImage((PageflowElement) getModel()));
- getPageflowNodeFigure().setToolTipText(annotation.getText());
- }
-
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public void removeAnnotation() {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getPageflowNodeFigure().setImage(
- getImage((PageflowElement) getModel()));
- getPageflowNodeFigure().setToolTipText(null);
- }
-
- });
- }
-
- /**
- * Returns the image for the pageflow element.
- *
- * @param element -
- * pageflow element
- * @return - the image for the pageflow element.
- */
- private Image getDecoratedImage(PageflowElement element) {
- Image decoratedImage = getImage(element);
-
- decoratedImage = getImageDecorator().decorateImage(getImage(element),
- null);
-
- return decoratedImage;
- }
-
- private ImageDecorator getImageDecorator() {
- if (imageDecorator == null) {
- imageDecorator = new ImageDecorator();
- }
- return imageDecorator;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java
deleted file mode 100644
index 6c99b636f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-
-/**
- * The <code>TreeEditPart</code> implementation for a pageflow.
- *
- *
- */
-public class PageflowTreeEditPart extends PageflowElementTreeEditPart {
-
- /**
- * Creates a new PageflowTreeEditPart instance.
- *
- * @param pageflow
- * @param showOnlyCompoundTasks
- */
- public PageflowTreeEditPart(Pageflow pageflow) {
- super(pageflow);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#getModelChildren()
- */
- protected List getModelChildren() {
- List children = getPageflow().getNodes();
-
- return new ArrayList(children);
- }
-
- /**
- * Returns the model as <code>Pageflow</code>.
- *
- * @return the model as <code>Pageflow</code>
- */
- public Pageflow getPageflow() {
- return (Pageflow) getModel();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java
deleted file mode 100644
index 96deb0500..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-
-public class PageflowTreePartFactory implements EditPartFactory {
- /*
- * (non-Javadoc)
- *
- * @see EditPartFactory#createEditPart()
- */
- public EditPart createEditPart(EditPart context, Object model) {
-
- if (model instanceof Pageflow) {
- return new PageflowTreeEditPart((Pageflow) model);
-
- } else if (model instanceof PageflowElement) {
- return new PageflowElementTreeEditPart((PageflowElement) model);
- }
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java
deleted file mode 100644
index 718b7ac1c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.BendpointEditPolicy;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.CreateBendpointCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteBendpointCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.MoveBendpointCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-
-public class PFLinkBendpointEditPolicy extends BendpointEditPolicy {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editpolicies.BendpointEditPolicy#getCreateBendpointCommand(org.eclipse.gef.requests.BendpointRequest)
- */
- protected Command getCreateBendpointCommand(BendpointRequest request) {
- CreateBendpointCommand createCmd = new CreateBendpointCommand();
- Point p = request.getLocation();
- Connection conn = getConnection();
-
- conn.translateToRelative(p);
-
- createCmd.setLocation(p);
- Point ref1 = getConnection().getSourceAnchor().getReferencePoint();
- Point ref2 = getConnection().getTargetAnchor().getReferencePoint();
-
- conn.translateToRelative(ref1);
- conn.translateToRelative(ref2);
-
- createCmd.setRelativeDimensions(p.getDifference(ref1), p
- .getDifference(ref2));
- createCmd.setPFLink((PageflowLink) request.getSource().getModel());
- createCmd.setIndex(request.getIndex());
- return createCmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editpolicies.BendpointEditPolicy#getDeleteBendpointCommand(org.eclipse.gef.requests.BendpointRequest)
- */
- protected Command getDeleteBendpointCommand(BendpointRequest request) {
- DeleteBendpointCommand deleteCom = new DeleteBendpointCommand();
- Point p = request.getLocation();
- deleteCom.setLocation(p);
- deleteCom.setPFLink((PageflowLink) request.getSource().getModel());
- deleteCom.setIndex(request.getIndex());
- return deleteCom;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editpolicies.BendpointEditPolicy#getMoveBendpointCommand(org.eclipse.gef.requests.BendpointRequest)
- */
- protected Command getMoveBendpointCommand(BendpointRequest request) {
- MoveBendpointCommand moveCmd = new MoveBendpointCommand();
- Point p = request.getLocation();
- Connection conn = getConnection();
-
- conn.translateToRelative(p);
-
- moveCmd.setLocation(p);
-
- Point ref1 = getConnection().getSourceAnchor().getReferencePoint();
- Point ref2 = getConnection().getTargetAnchor().getReferencePoint();
-
- conn.translateToRelative(ref1);
- conn.translateToRelative(ref2);
-
- moveCmd.setRelativeDimensions(p.getDifference(ref1), p
- .getDifference(ref2));
- moveCmd.setPFLink((PageflowLink) request.getSource().getModel());
- moveCmd.setIndex(request.getIndex());
- return moveCmd;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java
deleted file mode 100644
index 5f098ea76..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ConnectionCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteConnectionCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-
-public class PFLinkEditPolicy extends ConnectionEditPolicy {
-
- public PFLinkEditPolicy() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEditPolicy#getDeleteCommand
- */
- protected Command getDeleteCommand(GroupRequest request) {
- ConnectionCommand c = new DeleteConnectionCommand();
- c.setPFLink((PageflowLink) getHost().getModel());
- return c;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java
deleted file mode 100644
index 06a9e39f9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-
-public class PFLinkEndpointEditPolicy extends ConnectionEndpointEditPolicy {
- /**
- *
- */
- public PFLinkEndpointEditPolicy() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEndpointEditPolicy#addSelectionHandles
- */
- protected void addSelectionHandles() {
- super.addSelectionHandles();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- int connectionWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- getConnectionFigure().setLineWidth(connectionWidth + 1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEndpointEditPolicy#getConnectionFigure
- */
- protected PolylineConnection getConnectionFigure() {
- return (PolylineConnection) ((GraphicalEditPart) getHost()).getFigure();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEndpointEditPolicy#removeSelectionHandles
- */
- protected void removeSelectionHandles() {
- super.removeSelectionHandles();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- int connectionWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- getConnectionFigure().setLineWidth(connectionWidth);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java
deleted file mode 100644
index f6d9c7c47..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.OrphanChildCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-public class PageflowContainerEditPolicy extends ContainerEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see ContainerEditPolicy#getCreateCommand()
- */
- protected Command getCreateCommand(CreateRequest request) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ContainerEditPolicy#getOrphanChildrenCommand()
- */
- public Command getOrphanChildrenCommand(GroupRequest request) {
- List parts = request.getEditParts();
- CompoundCommand result = new CompoundCommand("orphanchildcommand");
- for (int i = 0; i < parts.size(); i++) {
- OrphanChildCommand orphan = new OrphanChildCommand();
- orphan
- .setChild((PageflowNode) ((EditPart) parts.get(i))
- .getModel());
- orphan.setParent((Pageflow) getHost().getModel());
- orphan.setLabel("label here");
- result.add(orphan);
- }
- return result.unwrap();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java
deleted file mode 100644
index 8175c7cc9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-public class PageflowElementEditPolicy extends
- org.eclipse.gef.editpolicies.ComponentEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see ComponentEditPolicy#createDeleteCommand()
- */
- protected Command createDeleteCommand(GroupRequest request) {
- Object parent = getHost().getParent().getModel();
- DeleteNodeCommand deleteCmd = new DeleteNodeCommand((Pageflow) parent);
- deleteCmd.setParent((Pageflow) parent);
- deleteCmd.setChild((PageflowNode) getHost().getModel());
- return deleteCmd;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java
deleted file mode 100644
index c89d648c8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.RenameNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * EditPolicy for the direct editing of pageflow node's name.
- *
- * @author Xiaoguang Zhang
- */
-public class PageflowNodeDirectEditPolicy extends DirectEditPolicy {
-
- /*
- * (non-javadoc)
- *
- * @see DirectEditPolicy#getDirectEditCommand(DirectEditRequest)
- */
- protected Command getDirectEditCommand(DirectEditRequest request) {
- RenameNodeCommand cmd = new RenameNodeCommand();
- cmd.setSource((PageflowNode) getHost().getModel());
- cmd.setOldName(((PageflowNode) getHost().getModel()).getName());
- cmd.setName((String) request.getCellEditor().getValue());
- return cmd;
- }
-
- /*
- * (non-javadoc)
- *
- * @see DirectEditPolicy#showCurrentEditValue(DirectEditRequest)
- */
- protected void showCurrentEditValue(DirectEditRequest request) {
- // String value = (String)request.getCellEditor().getValue();
- // ((PageflowNodeFigure)getHostFigure()).setText(value);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java
deleted file mode 100644
index d7024f33b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.OpenEditorAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ConnectionCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ConnectionCommandFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.OpenEditorCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-
-public class PageflowNodeEditPolicy extends GraphicalNodeEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#createDummyConnection()
- */
- protected Connection createDummyConnection(Request req) {
- PolylineConnection conn = new PolylineConnection();
- conn.setLineWidth(getLineWidth());
- conn.setForegroundColor(ColorConstants.black);
-
- return conn;
- }
-
- /**
- * get the connection line width from preference.
- */
- private int getLineWidth() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- int lineWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- return lineWidth;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getConnectionCompleteCommand()
- */
- protected Command getConnectionCompleteCommand(
- CreateConnectionRequest request) {
- ConnectionCommand command = (ConnectionCommand) request
- .getStartCommand();
- // ConnectionAnchor anchor =
- // getPageflowNodeEditPart().getTargetConnectionAnchor(request);
-
- command.setTarget(getPageflowNode());
-
- return command;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getConnectionCreateCommand()
- */
- protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
- ConnectionCommand command = ConnectionCommandFactory
- .createCommand(request);
- command.setPFLink((PageflowLink) request.getNewObject());
- PageflowNode flowObject = getPageflowNode();
- command.setSource(flowObject);
- request.setStartCommand(command);
- return command;
- }
-
- /**
- * get the edit part of pageflow node
- *
- * @return - the edit part of pageflow node
- */
- protected PageflowNodeEditPart getPageflowNodeEditPart() {
- return (PageflowNodeEditPart) getHost();
- }
-
- /**
- * get the pageflow node
- *
- * @return - the pageflow node
- */
- protected PageflowNode getPageflowNode() {
- return (PageflowNode) getHost().getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getReconnectTargetCommand()
- */
- protected Command getReconnectTargetCommand(ReconnectRequest request) {
- ConnectionCommand cmd = ConnectionCommandFactory.createCommand(request);
- cmd
- .setPFLink((PageflowLink) request.getConnectionEditPart()
- .getModel());
- cmd.setTarget(getPageflowNode());
- return cmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getReconnectSourceCommand()
- */
- protected Command getReconnectSourceCommand(ReconnectRequest request) {
- ConnectionCommand cmd = ConnectionCommandFactory.createCommand(request);
- cmd
- .setPFLink((PageflowLink) request.getConnectionEditPart()
- .getModel());
- cmd.setSource(getPageflowNode());
- return cmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getCommand()
- */
- public Command getCommand(Request request) {
- if (OpenEditorAction.OPEN_EDITOR_REQUEST.equals(request.getType())) {
- OpenEditorCommand command = new OpenEditorCommand(getHost());
-
- command.setChild((PageflowNodeImpl) getHost().getModel());
-
- return command;
- }
-
- return super.getCommand(request);
- }
-
- /**
- * return the pageflow node figure
- *
- * @return - the pageflow node's figure
- */
- protected PageflowNodeFigure getPageflowNodeFigure() {
- return (PageflowNodeFigure) ((GraphicalEditPart) getHost()).getFigure();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java
deleted file mode 100644
index 27cad2dfd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-
-/**
- * Handles selection of Node. Primary selection is denoted by highlight and a
- * focus rectangle. Normal selection is denoted by highlight only.
- *
- * @author xgzhang
- */
-public class PageflowNodeSelectionEditPolicy extends NonResizableEditPolicy {
-
- private PageflowNodeFigure getFigure() {
- PageflowNodeEditPart part = (PageflowNodeEditPart) getHost();
- return ((PageflowNodeFigure) part.getFigure());
- }
-
- /**
- * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#hideSelection()
- */
- protected void hideSelection() {
- super.hideSelection();
- // getFigure().setSelected(false);
- }
-
- /**
- * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
- */
- protected void showPrimarySelection() {
- super.showPrimarySelection();
- // getFigure().setSelected(true);
- }
-
- /**
- * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
- */
- protected void showSelection() {
- super.showSelection();
- // getFigure().setSelected(true);
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java
deleted file mode 100644
index 53d0d8c9d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ResizableEditPolicy;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.AddNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.CreateNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.SetConstraintCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-public class PageflowXYLayoutEditPolicy extends XYLayoutEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#createAddCommand()
- */
- protected Command createAddCommand(EditPart childEditPart, Object constraint) {
- PageflowNode part = (PageflowNode) childEditPart.getModel();
- Rectangle rect = (Rectangle) constraint;
-
- AddNodeCommand add = new AddNodeCommand();
- add.setParent((Pageflow) getHost().getModel());
- add.setChild(part);
- add.setLabel("add");
- add.setDebugLabel("PageFlowXYEP add subpart"); //$NON-NLS-1$
-
- SetConstraintCommand setConstraint = new SetConstraintCommand();
-
- setConstraint.setLocation(rect);
- setConstraint.setPart(part);
- setConstraint.setLabel("add");
- setConstraint.setDebugLabel("PageFlowXYEP setConstraint"); //$NON-NLS-1$
- return add.chain(setConstraint);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#createChangeConstraintCommand()
- */
- protected Command createChangeConstraintCommand(EditPart child,
- Object constraint) {
- SetConstraintCommand locationCommand = new SetConstraintCommand();
- locationCommand.setPart((PageflowNode) child.getModel());
- locationCommand.setLocation((Rectangle) constraint);
- return locationCommand;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#createChildEditPolicy()
- */
- protected EditPolicy createChildEditPolicy(EditPart child) {
- if (child instanceof PageflowNodeEditPart) {
- return new PageflowNodeSelectionEditPolicy();
- }
-
- return new ResizableEditPolicy();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#getCreateCommand()
- */
- protected Command getCreateCommand(CreateRequest request) {
- CreateNodeCommand create = new CreateNodeCommand();
- create.setParent((Pageflow) getHost().getModel());
- create.setChild((PageflowNode) request.getNewObject());
- Rectangle constraint = (Rectangle) getConstraintFor(request);
- create.setLocation(constraint);
- create.setLabel("Add");
- return create;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#getDeleteDependantCommand()
- */
- protected Command getDeleteDependantCommand(Request request) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#getOrphanChildrenCommand()
- */
- protected Command getOrphanChildrenCommand(Request request) {
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java
deleted file mode 100644
index 702e58e09..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This label is used in connection figure, which has a border.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class ConnectionLabel extends Label {
- /**
- *
- */
- public ConnectionLabel() {
- this(null, null);
- }
-
- /**
- * @param s
- */
- public ConnectionLabel(String s) {
- this(s, null);
- }
-
- /**
- * @param i
- */
- public ConnectionLabel(Image i) {
- this(null, i);
- }
-
- /**
- * @param s
- * @param i
- */
- public ConnectionLabel(String s, Image i) {
- super(s, i);
-
- // setBorder(new LineBorder());
- setOpaque(true);
- }
-
- /**
- * set the label's border's width
- *
- * @param w
- */
- public void setBorderWidth(int w) {
- if (getBorder() != null) {
- ((LineBorder) getBorder()).setWidth(w);
- }
- }
-
- /**
- * set the label's border's color
- *
- * @param c
- */
- public void setBorderColor(Color c) {
- if (getBorder() != null) {
- ((LineBorder) getBorder()).setColor(c);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java
deleted file mode 100644
index d1d01373a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A label decorator decorates the label text and image for some element. The
- * original label text and image are obtained by some other means,
- *
- *
- * @author Xiao-guang Zhang
- */
-public interface ILabelDecorator {
- /**
- * Returns an image that is based on the given image, but decorated with
- * additional information relating to the state of the provided element.
- *
- * @param image
- * the input image to decorate, or <code>null</code> if the
- * element has no image
- * @param element
- * the element whose image is being decorated
- * @return the decorated image, or <code>null</code> if no decoration is
- * to be applied
- *
- * @see org.eclipse.jface.resource.CompositeImageDescriptor
- */
- public Image decorateImage(Image image, Object element);
-
- /**
- * Returns a text label that is based on the given text label, but decorated
- * with additional information relating to the state of the provided
- * element.
- *
- *
- * @param text
- * the input text label to decorate
- * @param element
- * the element whose image is being decorated
- * @return the decorated text label, or <code>null</code> if no decoration
- * is to be applied
- */
- public String decorateText(String text, Object element);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java
deleted file mode 100644
index 383f0d5a3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This derived label has simple tooltip support
- *
- * @author Xiao-guang Zhang
- *
- */
-public class NodeLabel extends Label {
- /**
- *
- */
- public NodeLabel() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param s
- */
- public NodeLabel(String s) {
- super(s);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param i
- */
- public NodeLabel(Image i) {
- super(i);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param s
- * @param i
- */
- public NodeLabel(String s, Image i) {
- super(s, i);
- // TODO Auto-generated constructor stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Label#setTextPlacement(int)
- */
- public void setTextPlacement(int where) {
- super.setTextPlacement(where);
- layout();
- invalidate();
- }
-
- /**
- * set tooltip text
- *
- * @param text
- */
- public void setToolTipText(String text) {
- Label toolTip = null;
-
- if (text != null && text.length() > 0) {
- toolTip = new Label(text);
- toolTip.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTip);
- }
-
- /**
- * get tooltip's text
- *
- * @return
- */
- public String getToolTipText() {
- if (getToolTip() != null)
- return ((Label) getToolTip()).getText();
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java
deleted file mode 100644
index 21339af58..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.MidpointLocator;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- * The figure for pflink, used by pflink edit part, which is a polyline with a
- * label control on it, and with tooltip support.
- *
- * @author Xiao-guang Zhang
- */
-public class PFLinkFigure extends PolylineConnection {
- /** the label attached to the connection */
- private ConnectionLabel textLabel = null;
-
- private ConnectionLabel iconLabel = null;
-
- /** The label's background color */
- private Color labelBgColor;
-
- /** The label's foreground color */
- private Color labelFgColor;
-
- /** the label's font */
- private Font labelFont;
-
- /** The label's visiblity */
- private boolean bLabelVisible = false;
-
- /** The connection's line width */
- private int lineWidth = 0;
-
- /** the polygon decoration for connection line */
- private PolygonDecoration arrow;
-
- /**
- *
- */
- public PFLinkFigure() {
- arrow = new PolygonDecoration();
- arrow.setTemplate(PolygonDecoration.TRIANGLE_TIP);
- arrow.setScale(10, getLineWidth() * 2);
- setTargetDecoration(arrow);
- setForegroundColor(getForegroundColor());
- }
-
- /**
- * set the connection's label string
- *
- * @param strLabel
- */
- public void setLabel(String strLabel) {
- if (null != strLabel) {
- if (textLabel == null) {
- textLabel = new ConnectionLabel();
- textLabel.setFont(getLabelFont());
- textLabel.setBackgroundColor(getLabelBackgroundColor());
- textLabel.setForegroundColor(getLabelForegroundColor());
- setLineWidth(getLineWidth());
- setLabelVisible(getLabelVisible());
- setForegroundColor(getForegroundColor());
- add(textLabel, new MidpointLocator(this, 1));
- }
- // textLabel.setVisible(true);
- textLabel.setText(strLabel);
- }
- }
-
- public void clearIcon() {
- setImage(null);
- }
-
- public void clearOutcome() {
- setLabel("");
- }
-
- /**
- * set the connection's label string
- *
- * @param strLabel
- */
- public void setImage(Image image) {
- if (textLabel == null) {
- textLabel = new ConnectionLabel();
- textLabel.setFont(getLabelFont());
- textLabel.setBackgroundColor(getLabelBackgroundColor());
- textLabel.setForegroundColor(getLabelForegroundColor());
- setLineWidth(getLineWidth());
- setLabelVisible(getLabelVisible());
- setForegroundColor(getForegroundColor());
- add(textLabel, new MidpointLocator(this, 0));
- }
- textLabel.setIcon(image);
- }
-
- public void setActionImage() {
- ImageDescriptor imageDescriptor = PageflowElementEditPart.IMG_ACTION;
- Image image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
- setImage(image);
- }
-
- public Image getImage() {
- if (textLabel != null) {
- return textLabel.getIcon();
- } else {
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText()
- */
- public void setToolTipText(String text) {
- Label toolTip = null;
-
- if (text != null && text.length() > 0) {
- toolTip = new Label(text);
- toolTip.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTip);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getToolTipText()
- */
- public String getToolTipText() {
- if (getToolTip() != null) {
- return ((Label) getToolTip()).getText();
- }
- return null;
- }
-
- /**
- * set the font including label's
- *
- */
- public void setFont(Font f) {
- if (textLabel != null) {
- textLabel.setFont(f);
- }
- super.setFont(f);
- }
-
- /**
- * get the label's font from preference
- *
- */
- private Font getLabelFont() {
- if (labelFont == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelFont = new Font(null, PreferenceConverter.getFontData(store,
- GEMPreferences.LINE_LABEL_FONT));
- }
- return labelFont;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Shape#setLineWidth(int)
- */
- public void setLineWidth(int w) {
- if (textLabel != null) {
- textLabel.setBorderWidth(w);
- }
- arrow.setScale(10, getLineWidth() * 2);
- super.setLineWidth(w);
- }
-
- /**
- * get the connection line width from preference.
- */
- public int getLineWidth() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- lineWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- return lineWidth;
- }
-
- /**
- * set label's visibility
- *
- * @param flag -
- * visible or not.
- */
- public void setLabelVisible(boolean flag) {
- if (textLabel != null) {
- textLabel.setVisible(flag);
- }
- }
-
- /**
- * get the label's visiblity from preference
- *
- */
- private boolean getLabelVisible() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- bLabelVisible = store.getBoolean(GEMPreferences.SHOW_LINE_LABELS);
- return bLabelVisible;
- }
-
- /**
- * set the label's foreground color
- *
- * @param c
- */
- public void setLabelForegroundColor(Color c) {
- labelFgColor = c;
- if (textLabel != null) {
- textLabel.setForegroundColor(c);
- }
- }
-
- /**
- * get the label's foreground color from preference
- *
- */
- private Color getLabelForegroundColor() {
- if (labelFgColor == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_FONT_COLOR);
- }
- return labelFgColor;
- }
-
- /**
- * set the label's background color
- *
- * @param c
- */
- public void setLabelBackgroundColor(Color c) {
- labelBgColor = c;
- if (textLabel != null) {
- textLabel.setBackgroundColor(c);
- }
- }
-
- /**
- * get the label's background color from preference
- *
- */
- private Color getLabelBackgroundColor() {
- if (labelBgColor == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelBgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_COLOR);
- }
- return labelBgColor;
- }
-
- /**
- * get the foreground color from preference
- *
- */
- public Color getForegroundColor() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- fgColor = GEMPreferences.getColor(store, GEMPreferences.LINE_COLOR);
- return fgColor;
- }
-
- /**
- * set the figure's foreground, which will also update the label's border's
- * color.
- */
- public void setForegroundColor(Color c) {
- if (textLabel != null) {
- textLabel.setBorderColor(c);
- }
- super.setForegroundColor(c);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java
deleted file mode 100644
index 28fb8cff1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import java.util.Vector;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LabelAnchor;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The figure for pageflow node, used by pageflow node edit part.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowNodeFigure extends Figure {
- /** Same connection anchors for source and target */
- protected Vector connectionAnchors = new Vector(1);
-
- /** label of the pageflow node figure */
- private NodeLabel label;
-
- /** the foreground color of Label */
- private Color labelFgColor;
-
- /** the background color of Label */
- private Color labelBgColor;
-
- /** the text placement for the label */
- private int textPlacement = PositionConstants.SOUTH;
-
- /** the label's font */
- private Font labelFont;
-
- public PageflowNodeFigure() {
- setLayoutManager(new FlowLayout());
-
- // initializeConnectionAnchors();
- }
-
- /**
- * get the source(output) anchor according to the input point.
- *
- * @param p -
- * the input point
- * @return - Source ConnectionAnchor
- */
- public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
- if (getSourceConnectionAnchors().size() == 0) {
- return null;
- }
- return (ConnectionAnchor) getSourceConnectionAnchors().get(0);
- }
-
- /**
- * get the default source anchor
- *
- * @return - Source ConnectionAnchor
- */
- public ConnectionAnchor getSourceConnectionAnchor() {
- if (getSourceConnectionAnchors().size() == 0) {
- return null;
- }
- return (ConnectionAnchor) getSourceConnectionAnchors().get(0);
- }
-
- /**
- * Get the source connection anchors vector
- *
- * @return - the vector
- */
- private Vector getSourceConnectionAnchors() {
- return connectionAnchors;
- }
-
- /**
- * get the target (input) connection Anchor according the input point
- *
- * @param p -
- * the input Point
- * @return - ConnectionAnchor
- */
- public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
- if (getTargetConnectionAnchors().size() == 0) {
- return null;
- }
- return (ConnectionAnchor) getTargetConnectionAnchors().get(0);
- }
-
- /**
- * get the default target (input) connection Anchor
- *
- * @return - ConnectionAnchor
- */
- public ConnectionAnchor getTargetConnectionAnchor() {
- if (getTargetConnectionAnchors().size() == 0) {
- return null;
- }
- return (ConnectionAnchor) getTargetConnectionAnchors().get(0);
- }
-
- /**
- * Get the target connection anchors vector
- *
- * @return - the vector
- */
- private Vector getTargetConnectionAnchors() {
- return connectionAnchors;
- }
-
- /**
- * update the anchors
- *
- */
- public void update() {
- initializeConnectionAnchors();
- }
-
- /**
- * Initialize the connection anchors
- *
- */
- private void initializeConnectionAnchors() {
- connectionAnchors.removeAllElements();
- ChopboxAnchor inputConnectionAnchor = new LabelAnchor(label);
- connectionAnchors.addElement(inputConnectionAnchor);
- }
-
- /**
- * get the text placement from preference.
- *
- */
- private int getTextPlacement() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- String s = store.getString(GEMPreferences.LABEL_PLACEMENT);
- if (GEMPreferences.LABEL_PLACEMENT_TOP.equals(s)) {
- textPlacement = PositionConstants.NORTH;
- }
- if (GEMPreferences.LABEL_PLACEMENT_BOTTOM.equals(s)) {
- textPlacement = PositionConstants.SOUTH;
- }
- if (GEMPreferences.LABEL_PLACEMENT_LEFT.equals(s)) {
- textPlacement = PositionConstants.WEST;
- }
- if (GEMPreferences.LABEL_PLACEMENT_RIGHT.equals(s)) {
- textPlacement = PositionConstants.EAST;
- }
- return textPlacement;
- }
-
- /**
- * get the label's background color from preference.
- *
- * @return
- */
- private Color getLabelBackgroundColor() {
- return labelBgColor;
- }
-
- /**
- * get the label's foreground color from preference.
- *
- * @return
- */
- private Color getLabelForegroundColor() {
- if (labelFgColor == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.FIGURE_LABEL_FONT_COLOR);
- }
- return labelFgColor;
- }
-
- /**
- * get the labe's font from preference.
- *
- * @return
- */
- private Font getLabelFont() {
- if (labelFont == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelFont = new Font(null, PreferenceConverter.getFontData(store,
- GEMPreferences.FIGURE_LABEL_FONT));
- }
- return labelFont;
- }
-
- /**
- * set the image and text of the figure
- *
- * @param image -
- * the image
- * @param str -
- * the label
- */
- public void setImageText(Image image, String str) {
- if (image == null) {
- setText(str);
- } else if (str == null) {
- setImage(image);
- } else {
- if (label == null) {
- label = new NodeLabel(str, image);
- label.setTextPlacement(getTextPlacement());
- label.setForegroundColor(getLabelForegroundColor());
- label.setFont(getLabelFont());
- add(label);
- initializeConnectionAnchors();
- } else {
- label.setIcon(image);
- label.setText(str);
- }
- }
- }
-
- /**
- * set the image of the figure
- *
- * @param image -
- * the image
- */
- public void setImage(Image image) {
- if (image == null) {
- return;
- }
- if (label == null) {
- label = new NodeLabel(image);
- label.setTextPlacement(getTextPlacement());
- label.setForegroundColor(getLabelForegroundColor());
- label.setFont(getLabelFont());
- add(label);
- initializeConnectionAnchors();
- } else {
- label.setIcon(image);
- }
- }
-
- /**
- * set the text of the figure
- *
- * @param str -
- * the text
- */
- public void setText(String str) {
- if (str == null) {
- return;
- }
- if (label == null) {
- label = new NodeLabel(str);
- label.setTextPlacement(getTextPlacement());
- label.setForegroundColor(getLabelForegroundColor());
- label.setFont(getLabelFont());
- add(label);
- initializeConnectionAnchors();
- } else {
- label.setText(str);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#useLocalCoordinates()
- */
- protected boolean useLocalCoordinates() {
- return true;
- }
-
- /**
- * Returns the imageBounds.
- *
- * @return - Rectangle of image
- */
- public Rectangle getImageBounds() {
- return label.getIconBounds();
- }
-
- /**
- * Returns the textBounds.
- *
- * @return - Rectangle of text field
- */
- public Rectangle getTextBounds() {
- return label.getTextBounds();
- }
-
- /**
- * Returns the label.
- *
- * @return - Label
- */
- public Label getLabel() {
- return label;
- }
-
- /**
- * set the label's backaground
- */
- public void setBackgroundColor(Color bg) {
- labelBgColor = bg;
- if (label != null) {
- label.setBackgroundColor(bg);
- }
- }
-
- /**
- * set the label's foreground
- */
- public void setForegroundColor(Color fg) {
- labelFgColor = fg;
-
- if (label != null) {
- label.setForegroundColor(fg);
- }
- }
-
- /**
- * Set the label's font
- */
- public void setFont(Font f) {
- if (label != null) {
- label.setFont(f);
- }
- super.setFont(f);
- }
-
- /**
- * Set the text placement for the label
- *
- * @param where
- */
- public void setTextPlacement(int where) {
- textPlacement = where;
- if (label != null) {
- label.setTextPlacement(where);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText()
- */
- public void setToolTipText(String text) {
- Label toolTip = null;
-
- if (text != null && text.length() > 0) {
- toolTip = new Label(text);
- toolTip.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTip);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getToolTipText()
- */
- public String getToolTipText() {
- if (getToolTip() != null) {
- return ((Label) getToolTip()).getText();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java
deleted file mode 100644
index 49d56be4c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java
+++ /dev/null
@@ -1,552 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowModelManager;
-
-/**
- * This class is a singleton adpater to create the directed graph for the
- * specified pageflow model or update the location information of pageflow model
- * according to directed graph layout algorithms.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowLayoutManager {
- /** node's default size */
- private static final int NODE_DEFAULT_WIDTH = 50;
-
- private static final int NODE_DEFAULT_HEIGHT = 50;
-
- /**
- * the margin of the top and left , and margin between each connnected
- * directed graph.
- */
- private static final int X_SPACE = 50;
-
- private static final int Y_SPACE = 50;
-
- /** node's default padding */
- private static final int DEFAULT_PADDING = 30;
-
- private static PageflowLayoutManager manager;
-
- private Map copiedLinks = null;
-
- /**
- * constructor of PageflowDirectedGraphAdapter
- *
- */
- private PageflowLayoutManager() {
-
- }
-
- /**
- * return the singleton instance of PageflowDirectedGraphAdapter
- *
- * @return - the singleton instance of PageflowDirectedGraphAdapter
- */
- static public PageflowLayoutManager getInstance() {
- if (manager == null) {
- manager = new PageflowLayoutManager();
- }
- return manager;
- }
-
- /**
- * layout pageflow using directed graph layout algorithms
- *
- * @param pageflow -
- * pageflow model
- */
- public void layoutPageflow(Pageflow pageflow) {
- List selfLoopLinks = removeSelfLoopLinks(pageflow);
-
- List lstGraph = createGraphs(pageflow);
- for (Iterator iter = lstGraph.iterator(); iter.hasNext();) {
- DirectedGraph graph = (DirectedGraph) iter.next();
- new DirectedGraphLayout().visit(graph);// .visit(graph);
- }
- updatePageflow(lstGraph);
-
- if (selfLoopLinks != null) {
- addSelfLoopLinks(pageflow, selfLoopLinks);
- }
- }
-
- /**
- * remove the self loop links from pageflow, because the layout algorithm
- * does not allow it.
- *
- * @param pageflow
- * @return
- */
- private List removeSelfLoopLinks(Pageflow pageflow) {
- List selfLoopLinks = new ArrayList();
-
- if (pageflow.getLinks() != null) {
- for (Iterator iter = pageflow.getLinks().iterator(); iter.hasNext();) {
- PageflowLink link = (PageflowLink) iter.next();
-
- if (link.getSource() == link.getTarget()) {
- iter.remove();
- link.getBendPoints().clear();
- selfLoopLinks.add(link);
- }
- }
- }
- return selfLoopLinks;
- }
-
- /**
- * add back the self loop links with updated bendpoints.
- *
- * @param pageflow
- * @param selfLoopLinks
- */
- private void addSelfLoopLinks(Pageflow pageflow, List selfLoopLinks) {
- if (pageflow.getLinks() != null && selfLoopLinks != null
- && selfLoopLinks.size() > 0) {
- EList links = pageflow.getLinks();
- for (Iterator iter = selfLoopLinks.iterator(); iter.hasNext();) {
- PageflowLink link = (PageflowLink) iter.next();
- updateSelfLoopLink(link);
- links.add(link);
- }
- }
- }
-
- /**
- * Update the bendpoints of the self loop link Follow the following style:
- *
- * LeftTop-Top | | Left----Node
- *
- * @param selfLoopLink
- */
- public static void updateSelfLoopLink(PageflowLink selfLoopLink) {
- PageflowNode sourceNode = selfLoopLink.getSource();
- Rectangle rectNode = getPageflowNodeBounds(sourceNode);
-
- EList outLinks = sourceNode.getOutlinks();
- if (outLinks != null && outLinks.size() > 0) {
- for (Iterator iter = outLinks.iterator(); iter.hasNext();) {
- PageflowLink anotherSelfLoopLink = (PageflowLink) iter.next();
- if (anotherSelfLoopLink != selfLoopLink
- && anotherSelfLoopLink.getTarget() == sourceNode) {
- rectNode = getFitnessRectangle(rectNode,
- anotherSelfLoopLink);
- }
- }
- }
-
- PageflowFactory factory = PageflowModelManager.getFactory();
- PageflowLinkBendpoint bpTop = factory.createPFLinkBendpoint();
- PageflowLinkBendpoint bpLeftTop = factory.createPFLinkBendpoint();
- PageflowLinkBendpoint bpLeft = factory.createPFLinkBendpoint();
-
- bpTop.setD1Height(-rectNode.height);
- bpTop.setD2Height(-rectNode.height);
-
- bpLeftTop.setD1Width(-rectNode.width);
- bpLeftTop.setD1Height(-rectNode.height);
- bpLeftTop.setD2Width(-rectNode.width);
- bpLeftTop.setD2Height(-rectNode.height);
-
- bpLeft.setD1Width(-rectNode.width);
- bpLeft.setD2Width(-rectNode.width);
-
- selfLoopLink.getBendPoints().add(bpTop);
- selfLoopLink.getBendPoints().add(bpLeftTop);
- selfLoopLink.getBendPoints().add(bpLeft);
- }
-
- /**
- * Calculate the fitness rectangle without conflict with the existing self
- * loop's rectangle.
- *
- * @param rectDefault
- * @param anotherSelfLoopLink
- */
- private static Rectangle getFitnessRectangle(Rectangle rectDefault,
- PageflowLink anotherSelfLoopLink) {
- EList bendPoints = anotherSelfLoopLink.getBendPoints();
- if (bendPoints != null && bendPoints.size() > 0) {
- for (Iterator iterBendPoint = bendPoints.iterator(); iterBendPoint
- .hasNext();) {
- PageflowLinkBendpoint bendPoint = (PageflowLinkBendpoint) iterBendPoint
- .next();
- if (bendPoint.getD1Width() == -rectDefault.width
- && bendPoint.getD1Height() == -rectDefault.height) {
- rectDefault = new Rectangle(0, 0, rectDefault.width
- + DEFAULT_PADDING, rectDefault.height
- + DEFAULT_PADDING);
- break;
- }
- }
- }
- return rectDefault;
- }
-
- /**
- * get the pageflow node's bounds, the orginal point is (0,0)
- *
- * @param pfNode
- * @return
- */
- private static Rectangle getPageflowNodeBounds(PageflowNode pfNode) {
- return new Rectangle(0, 0, 64, 36);
- }
-
- /**
- * get the pageflow node's border rectangle
- *
- * @param pfNode
- * @return
- */
- private static Rectangle getPageflowNodeRectangle(PageflowNode pfNode) {
- Rectangle rectNode = null;
-
- Rectangle bounds = getPageflowNodeBounds(pfNode);
-
- rectNode = new Rectangle(pfNode.getX(), pfNode.getY(), bounds.width,
- bounds.height);
-
- return rectNode;
- }
-
- /**
- * create the connected subgraphs for the pageflow model, because there
- * maybe more than one connected graph in one pageflow definition.
- *
- * @param pageflow -
- * Pageflow model
- * @return - the connected subgraphs
- */
- private List createGraphs(Pageflow pageflow) {
- /** the connected subgraphs */
- List lstGraph = null;
-
- if (pageflow != null) {
- // Graph is not connected totally.
- DirectedGraph graph = null;
- HashMap nodesMap = new HashMap();
-
- NodeList nodes = new NodeList();
- EdgeList edges = new EdgeList();
-
- // get all nodes in the pageflow
- List pfNodes = pageflow.getNodes();
- if (pfNodes != null) {
- for (Iterator iter = pfNodes.iterator(); iter.hasNext();) {
- PageflowNode pfNode = (PageflowNode) iter.next();
- Node node = new Node(pfNode);
- Rectangle rectNode = null;
- rectNode = getPageflowNodeBounds(pfNode);
- if (rectNode != null) {
- node.width = rectNode.width * 2;
- node.height = rectNode.height * 2;
- node.setPadding(new Insets(node.height, node.width,
- node.height, node.width));
- } else {
- node.width = NODE_DEFAULT_WIDTH;
- node.height = NODE_DEFAULT_HEIGHT;
- node.setPadding(new Insets(DEFAULT_PADDING));
- }
- nodesMap.put(pfNode, node);
- nodes.add(node);
- }
- }
- // get all edges in the pageflow
- List pfLinks = pageflow.getLinks();
- for (Iterator iter = pfLinks.iterator(); iter.hasNext();) {
- PageflowLink link = (PageflowLink) iter.next();
- PageflowNode source = link.getSource();
- PageflowNode target = link.getTarget();
- Node sourceNode = (Node) nodesMap.get(source);
- Node targetNode = (Node) nodesMap.get(target);
-
- if (sourceNode != null && targetNode != null) {
- Edge edge = new Edge(sourceNode, targetNode);
- edges.add(edge);
- }
- }
-
- graph = new DirectedGraph();
-
- graph.nodes = nodes;
- graph.edges = edges;
-
- // get the connected subgraphs.
- lstGraph = new ArrayList();
- lstGraph.add(graph);// ..getConnectedSubGraphs();
- }
- return lstGraph;
- }
-
- /**
- * update the pageflow according to layout results which are stored in the
- * connected subgraphs
- *
- * @param lstGraph -
- * connected subgraphs
- *
- */
- private void updatePageflow(List lstGraph) {
- // y coordiantion of the subgraph's start point
- int topSubGraph = 0;
-
- for (Iterator iter = lstGraph.iterator(); iter.hasNext();) {
- // sub graph's bottom
- int bottomSubGraph = 0;
- DirectedGraph graph = (DirectedGraph) iter.next();
- for (int i = 0; i < graph.nodes.size(); i++) {
- Node node = graph.nodes.getNode(i);
- if (!(node.data instanceof PageflowNode)) {
- continue;
- }
- PageflowNode pfNode = (PageflowNode) node.data;
- pfNode.setX(X_SPACE + node.y);
-
- pfNode.setY(Y_SPACE + node.x + topSubGraph);
-
- if ((Y_SPACE + node.x + topSubGraph) > bottomSubGraph) {
- bottomSubGraph = Y_SPACE + node.x + topSubGraph;
- }
- }
- topSubGraph = bottomSubGraph + Y_SPACE;
- }
- }
-
- /**
- * update new pageflow's layout using the existing one.
- *
- * @param pageflow
- * @param model
- */
- public void updatePageflowLayout(Pageflow newPageflow, Pageflow oldPageflow) {
- List notUpdatedNodes = new ArrayList();
-
- copiedLinks = new HashMap();
-
- if (oldPageflow.getNodes().size() > 0) {
- for (Iterator iter = newPageflow.getNodes().iterator(); iter
- .hasNext();) {
- PageflowNode newNode = (PageflowNode) iter.next();
-
- if (!updatePageflowNode(newNode, oldPageflow)) {
- notUpdatedNodes.add(newNode);
- }
- }
- } else {
- notUpdatedNodes.addAll(newPageflow.getNodes());
- }
-
- if (oldPageflow.getLinks().size() > 0) {
- for (Iterator iter = newPageflow.getLinks().iterator(); iter
- .hasNext();) {
- PageflowLink newLink = (PageflowLink) iter.next();
-
- updatePFLink(newLink, oldPageflow);
- }
- }
-
- // if there are still some nodes which are not updated,
- // they should be check whether there are some layout conflict.
- if (notUpdatedNodes.size() > 0) {
- resolveConflict(newPageflow, notUpdatedNodes);
- }
-
- }
-
- /**
- * Update pageflow node using the same node
- *
- * @param object
- * @return - the old pageflow node.
- */
- private boolean updatePageflowNode(PageflowNode newNode,
- Pageflow oldPageflow) {
- for (Iterator iter = oldPageflow.getNodes().iterator(); iter.hasNext();) {
- PageflowNode oldNode = (PageflowNode) iter.next();
-
- if (oldNode instanceof PageflowPage
- && newNode instanceof PageflowPage) {
- if (((PageflowPage) oldNode).getPath().trim().equals(
- ((PageflowPage) newNode).getPath().trim())) {
- updatePageflowNode(newNode, oldNode);
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Update pageflow node using the same node
- *
- * @param object
- * @return
- */
- private void updatePageflowNode(PageflowNode newNode, PageflowNode node) {
- newNode.setX(node.getX());
- newNode.setY(node.getY());
- }
-
- /**
- * If there are conflict for the nodes, it will resolve it.
- *
- * @param newPageflow
- * @param notUpdatedNodes
- */
- private void resolveConflict(Pageflow newPageflow, List notUpdatedNodes) {
- for (Iterator iter = notUpdatedNodes.iterator(); iter.hasNext();) {
- resolveConflict(newPageflow, (PageflowNode) iter.next());
- }
- }
-
- /**
- * Resolve the layout conflict
- *
- * @param newPageflow
- * @param node
- */
- private void resolveConflict(Pageflow newPageflow, PageflowNode node) {
- Rectangle nodeRect = getPageflowNodeRectangle(node);
- boolean bModified = false;
- for (int i = 0, size = newPageflow.getNodes().size(); i < size; i++) {
- PageflowNode fixedNode = (PageflowNode) newPageflow.getNodes().get(
- i);
- if (node == fixedNode) {
- continue;
- }
- Rectangle fixedNodeRect = getPageflowNodeRectangle(fixedNode);
- if (fixedNodeRect.intersects(nodeRect)) {
- nodeRect.x += fixedNodeRect.width + X_SPACE;
- nodeRect.y += fixedNodeRect.height + Y_SPACE;
- bModified = true;
- }
- }
- if (bModified) {
- node.setX(nodeRect.x);
- node.setY(nodeRect.y);
- }
- }
-
- /**
- * Update the link using the same link in the old pageflow
- *
- * @param newLink
- * @param oldPageflow
- */
- private void updatePFLink(PageflowLink newLink, Pageflow oldPageflow) {
- for (Iterator iter = oldPageflow.getLinks().iterator(); iter.hasNext();) {
- PageflowLink oldLink = (PageflowLink) iter.next();
-
- if (copiedLinks.get(oldLink) != null) {
- continue;
- }
-
- if (isSameLink(newLink, oldLink)) {
- updatePFLink(newLink, oldLink);
- break;
- }
- }
- }
-
- /**
- * Check whether this two links in differnet pageflow are same or not.
- *
- * @param newLink
- * @param oldLink
- * @return
- */
- private boolean isSameLink(PageflowLink newLink, PageflowLink oldLink) {
- PageflowNode newSource = newLink.getSource();
- PageflowNode newTarget = newLink.getTarget();
-
- PageflowNode oldSource = oldLink.getSource();
- PageflowNode oldTarget = oldLink.getTarget();
-
- // Page-Page
- if (newSource instanceof PageflowPage
- && oldSource instanceof PageflowPage
- && newTarget instanceof PageflowPage
- && oldTarget instanceof PageflowPage) {
- if (((PageflowPage) newSource).getPath().trim().equalsIgnoreCase(
- ((PageflowPage) oldSource).getPath().trim())
- && ((PageflowPage) newTarget)
- .getPath()
- .trim()
- .equalsIgnoreCase(
- ((PageflowPage) oldTarget).getPath().trim())) {
- if ((newLink.getOutcome() == null && oldLink.getOutcome() == null)
- || (newLink.getOutcome() != null
- && oldLink.getOutcome() != null && newLink
- .getOutcome().trim().equals(
- oldLink.getOutcome().trim()))) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Update the link using the same link
- *
- * @param nodesMap
- * @param object
- * @return
- */
- private PageflowLink updatePFLink(PageflowLink newLink, PageflowLink link) {
- PageflowFactory factory = PageflowModelManager.getFactory();
-
- newLink.getBendPoints().clear();
-
- for (Iterator iter = link.getBendPoints().iterator(); iter.hasNext();) {
- PageflowLinkBendpoint bendPoint = (PageflowLinkBendpoint) iter
- .next();
- PageflowLinkBendpoint newBendPoint = factory
- .createPFLinkBendpoint();
- newBendPoint.setD1Height(bendPoint.getD1Height());
- newBendPoint.setD1Width(bendPoint.getD1Width());
- newBendPoint.setD2Height(bendPoint.getD2Height());
- newBendPoint.setD2Width(bendPoint.getD2Width());
- newLink.getBendPoints().add(newBendPoint);
- }
-
- copiedLinks.put(link, link);
- return newLink;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java
deleted file mode 100644
index 9f56b7ca6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Pageflow</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes <em>Nodes</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks <em>Links</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile <em>Configfile</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow()
- * @model
- * @generated
- */
-public interface Pageflow extends PageflowElement {
- /**
- * Returns the value of the '<em><b>Nodes</b></em>' containment
- * reference list. The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode}.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Nodes</em>' containment reference list
- * isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Nodes</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow_Nodes()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode"
- * opposite="pageflow" containment="true"
- * @generated
- */
- EList getNodes();
-
- /**
- * Returns the value of the '<em><b>Links</b></em>' containment
- * reference list. The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink}. It
- * is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Links</em>' containment reference list
- * isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Links</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow_Links()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLink"
- * opposite="pageflow" containment="true"
- * @generated
- */
- EList getLinks();
-
- /**
- * Returns the value of the '<em><b>Configfile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Configfile</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Configfile</em>' attribute.
- * @see #setConfigfile(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow_Configfile()
- * @model
- * @generated
- */
- String getConfigfile();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile <em>Configfile</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Configfile</em>' attribute.
- * @see #getConfigfile()
- * @generated
- */
- void setConfigfile(String value);
-
- /**
- *
- * @generated NOT
- */
- public void connect(PageflowNode source, PageflowNode target, PageflowLink link);
-
- /**
- *
- * @generated NOT
- */
- public String getDefaultNodeName(Class nodeType);
-}
-// Pageflow
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java
deleted file mode 100644
index 379d526a7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.ReferenceElement;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight <em>Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement()
- * @model abstract="true"
- * @generated
- */
-public interface PageflowElement extends EObject {
- /**
- * The pageflow model is based on faces-config model, its elements will
- * reference faces-config elements with ReferenceElement.
- *
- * @generated NOT
- */
- public ReferenceElement getFCElements();
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute. The
- * default value is <code>"unnamed"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Name()
- * @model default="unnamed"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName <em>Name</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Comment</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Comment</em>' attribute.
- * @see #setComment(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Comment()
- * @model
- * @generated
- */
- String getComment();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment <em>Comment</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Comment</em>' attribute.
- * @see #getComment()
- * @generated
- */
- void setComment(String value);
-
- /**
- * Returns the value of the '<em><b>X</b></em>' attribute. The default
- * value is <code>"0"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>X</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>X</em>' attribute.
- * @see #setX(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_X()
- * @model default="0"
- * @generated
- */
- int getX();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX <em>X</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>X</em>' attribute.
- * @see #getX()
- * @generated
- */
- void setX(int value);
-
- /**
- * Returns the value of the '<em><b>Y</b></em>' attribute. The default
- * value is <code>"0"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Y</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Y</em>' attribute.
- * @see #setY(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Y()
- * @model default="0"
- * @generated
- */
- int getY();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY <em>Y</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Y</em>' attribute.
- * @see #getY()
- * @generated
- */
- void setY(int value);
-
- /**
- * Returns the value of the '<em><b>Width</b></em>' attribute. The
- * default value is <code>"-1"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Width</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Width</em>' attribute.
- * @see #setWidth(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Width()
- * @model default="-1"
- * @generated
- */
- int getWidth();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth <em>Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Width</em>' attribute.
- * @see #getWidth()
- * @generated
- */
- void setWidth(int value);
-
- /**
- * Returns the value of the '<em><b>Height</b></em>' attribute. The
- * default value is <code>"-1"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Height</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Height</em>' attribute.
- * @see #setHeight(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Height()
- * @model default="-1"
- * @generated
- */
- int getHeight();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight <em>Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Height</em>' attribute.
- * @see #getHeight()
- * @generated
- */
- void setHeight(int value);
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Id()
- * @model id="true" required="true" volatile="true"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId <em>Id</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Reference Link</b></em>' attribute.
- * The default value is <code>""</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Reference Link</em>' attribute isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Reference Link</em>' attribute.
- * @see #setReferenceLink(String)
- * @see pageflow.PageflowPackage#getPageflowElement_ReferenceLink()
- * @model default="" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='referenceLink'"
- * @generated
- */
- String getReferenceLink();
-
- /**
- * Sets the value of the '{@link pageflow.PageflowElement#getReferenceLink <em>Reference Link</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Reference Link</em>' attribute.
- * @see #getReferenceLink()
- * @generated
- */
- void setReferenceLink(String value);
-
- /**
- * @generated NOT
- */
- void notifyModelChanged(Notification nofitification);
-
- /**
- * When the model is modified, the adapters or reference elements should be
- * updated.
- *
- * @generated NOT
- */
- void update();
-
- /**
- * @generated NOT
- */
- void dispose();
-}
-// PageflowElement
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java
deleted file mode 100644
index 3d52525eb..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
- * create method for each non-abstract class of the model. <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage
- * @generated
- */
-public interface PageflowFactory extends EFactory {
- /**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- PageflowFactory eINSTANCE = new org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowFactoryImpl();
-
- /**
- * Returns a new object of class '<em>Pageflow</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Pageflow</em>'.
- * @generated
- */
- Pageflow createPageflow();
-
- /**
- * Returns a new object of class '<em>PF Link</em>'. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>PF Link</em>'.
- * @generated
- */
- PageflowLink createPFLink();
-
- /**
- * Returns a new object of class '<em>PF Page</em>'. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>PF Page</em>'.
- * @generated
- */
- PageflowPage createPFPage();
-
- /**
- * Returns a new object of class '<em>PF Link Bendpoint</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>PF Link Bendpoint</em>'.
- * @generated
- */
- PageflowLinkBendpoint createPFLinkBendpoint();
-
- /**
- * Returns the package supported by this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the package supported by this factory.
- * @generated
- */
- PageflowPackage getPageflowPackage();
-
-}
-// PageflowFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java
deleted file mode 100644
index 642a92b9a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import java.util.Vector;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PF Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getLargeicon <em>Largeicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getFromaction <em>Fromaction</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect <em>Redirect</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints <em>Bend Points</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.org.eclipse.jst.jsf.facesconfig.editor.pageflow.model.model.PageflowPackage#getPFLink()
- * @model
- * @generated
- */
-public interface PageflowLink extends PageflowElement {
- /**
- * Returns the value of the '<em><b>Pageflow</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks <em>Links</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Pageflow</em>' container reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Pageflow</em>' container reference.
- * @see #setPageflow(Pageflow)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Pageflow()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks
- * @model opposite="links" required="true"
- * @generated
- */
- Pageflow getPageflow();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Pageflow</em>' container reference.
- * @see #getPageflow()
- * @generated
- */
- void setPageflow(Pageflow value);
-
- /**
- * Returns the value of the '<em><b>Target</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks <em>Inlinks</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Target</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Target</em>' reference.
- * @see #setTarget(PageflowNode)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Target()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks
- * @model opposite="inlinks" required="true"
- * @generated
- */
- PageflowNode getTarget();
-
- void setTargetPath(String path);
-
- void setSourcePath(String path);
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Target</em>' reference.
- * @see #getTarget()
- * @generated
- */
- void setTarget(PageflowNode value);
-
- /**
- * Returns the value of the '<em><b>Source</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks <em>Outlinks</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source</em>' reference.
- * @see #setSource(PageflowNode)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Source()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks
- * @model opposite="outlinks" required="true"
- * @generated
- */
- PageflowNode getSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' reference.
- * @see #getSource()
- * @generated
- */
- void setSource(PageflowNode value);
-
- /**
- * Returns the value of the '<em><b>Smallicon</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Smallicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Smallicon</em>' attribute.
- * @see #setSmallicon(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Smallicon()
- * @model
- * @generated
- */
- String getSmallicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSmallicon <em>Smallicon</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Smallicon</em>' attribute.
- * @see #getSmallicon()
- * @generated
- */
- void setSmallicon(String value);
-
- /**
- * Returns the value of the '<em><b>Largeicon</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Largeicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Largeicon</em>' attribute.
- * @see #setLargeicon(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Largeicon()
- * @model
- * @generated
- */
- String getLargeicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getLargeicon <em>Largeicon</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Largeicon</em>' attribute.
- * @see #getLargeicon()
- * @generated
- */
- void setLargeicon(String value);
-
- /**
- * Returns the value of the '<em><b>Fromaction</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Fromaction</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Fromaction</em>' attribute.
- * @see #setFromaction(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Fromaction()
- * @model
- * @generated
- */
- String getFromaction();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getFromaction <em>Fromaction</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Fromaction</em>' attribute.
- * @see #getFromaction()
- * @generated
- */
- void setFromaction(String value);
-
- /**
- * Returns the value of the '<em><b>Outcome</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Outcome</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Outcome</em>' attribute.
- * @see #setOutcome(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Outcome()
- * @model
- * @generated
- */
- String getOutcome();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Outcome</em>' attribute.
- * @see #getOutcome()
- * @generated
- */
- void setOutcome(String value);
-
- /**
- * Returns the value of the '<em><b>Redirect</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Redirect</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Redirect</em>' attribute.
- * @see #setRedirect(boolean)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Redirect()
- * @model
- * @generated
- */
- boolean isRedirect();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect <em>Redirect</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Redirect</em>' attribute.
- * @see #isRedirect()
- * @generated
- */
- void setRedirect(boolean value);
-
- /**
- * Returns the value of the '<em><b>Bend Points</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint}.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bend Points</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Bend Points</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_BendPoints()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLinkBendpoint" opposite="link" containment="true"
- * @generated
- */
- EList getBendPoints();
-
- /**
- * <!-- begin-user-doc --> insert a new bendpoint to the link <!--
- * end-user-doc -->
- *
- * @generated NOT
- */
- public void insertBendpoint(int index, PageflowLinkBendpoint point);
-
- /**
- * <!-- begin-user-doc --> remove the current bendpoint <!-- end-user-doc
- * -->
- *
- * @generated NOT
- */
- public void removeBendpoint(int index);
-
- /**
- * <!-- begin-user-doc --> Set the current bendpoint <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoint(int index, PageflowLinkBendpoint point);
-
- /**
- * <!-- begin-user-doc --> Set a group of bendpoints to reconstruct the link
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoints(Vector points);
-
-}
-// PFLink
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java
deleted file mode 100644
index a0bb298d8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PF Link Bendpoint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width <em>D1 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height <em>D1 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width <em>D2 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height <em>D2 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight <em>Weight</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint()
- * @model
- * @generated
- */
-public interface PageflowLinkBendpoint extends EObject {
- /**
- * Returns the value of the '<em><b>D1 Width</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D1 Width</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D1 Width</em>' attribute.
- * @see #setD1Width(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D1Width()
- * @model
- * @generated
- */
- int getD1Width();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width <em>D1 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D1 Width</em>' attribute.
- * @see #getD1Width()
- * @generated
- */
- void setD1Width(int value);
-
- /**
- * Returns the value of the '<em><b>D1 Height</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D1 Height</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D1 Height</em>' attribute.
- * @see #setD1Height(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D1Height()
- * @model
- * @generated
- */
- int getD1Height();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height <em>D1 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D1 Height</em>' attribute.
- * @see #getD1Height()
- * @generated
- */
- void setD1Height(int value);
-
- /**
- * Returns the value of the '<em><b>D2 Width</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D2 Width</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D2 Width</em>' attribute.
- * @see #setD2Width(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D2Width()
- * @model
- * @generated
- */
- int getD2Width();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width <em>D2 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D2 Width</em>' attribute.
- * @see #getD2Width()
- * @generated
- */
- void setD2Width(int value);
-
- /**
- * Returns the value of the '<em><b>D2 Height</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D2 Height</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D2 Height</em>' attribute.
- * @see #setD2Height(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D2Height()
- * @model
- * @generated
- */
- int getD2Height();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height <em>D2 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D2 Height</em>' attribute.
- * @see #getD2Height()
- * @generated
- */
- void setD2Height(int value);
-
- /**
- * Returns the value of the '<em><b>Weight</b></em>' attribute. The
- * default value is <code>"0.5"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Weight</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Weight</em>' attribute.
- * @see #setWeight(float)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_Weight()
- * @model default="0.5"
- * @generated
- */
- float getWeight();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight <em>Weight</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Weight</em>' attribute.
- * @see #getWeight()
- * @generated
- */
- void setWeight(float value);
-
- /**
- * Returns the value of the '<em><b>Link</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints <em>Bend Points</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Link</em>' container reference isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Link</em>' container reference.
- * @see #setLink(PageflowLink)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_Link()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints
- * @model opposite="bendPoints" required="true"
- * @generated
- */
- PageflowLink getLink();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}'
- * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Link</em>' container reference.
- * @see #getLink()
- * @generated
- */
- void setLink(PageflowLink value);
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getFirstRelativeDimension();
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getSecondRelativeDimension();
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setRelativeDimensions(Dimension dim1, Dimension dim2);
-
-}
-// PFLinkBendpoint
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java
deleted file mode 100644
index fe50af4ac..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks <em>Outlinks</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks <em>Inlinks</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode()
- * @model abstract="true"
- * @generated
- */
-public interface PageflowNode extends PageflowElement {
- /**
- * Returns the value of the '<em><b>Pageflow</b></em>' container
- * reference. It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes <em>Nodes</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Pageflow</em>' container reference isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Pageflow</em>' container reference.
- * @see #setPageflow(Pageflow)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode_Pageflow()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes
- * @model opposite="nodes" required="true"
- * @generated
- */
- Pageflow getPageflow();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}'
- * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Pageflow</em>' container
- * reference.
- * @see #getPageflow()
- * @generated
- */
- void setPageflow(Pageflow value);
-
- /**
- * Returns the value of the '<em><b>Outlinks</b></em>' reference list.
- * The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink}. It
- * is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Outlinks</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Outlinks</em>' reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode_Outlinks()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLink"
- * opposite="source"
- * @generated
- */
- EList getOutlinks();
-
- /**
- * Returns the value of the '<em><b>Inlinks</b></em>' reference list.
- * The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink}. It
- * is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Inlinks</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Inlinks</em>' reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode_Inlinks()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLink"
- * opposite="target"
- * @generated
- */
- EList getInlinks();
-
- /**
- * @generated NOT
- */
- PageflowLink findLinkTo(PageflowNode target);
-
-}
-// PageflowNode
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java
deleted file mode 100644
index ce9358b27..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java
+++ /dev/null
@@ -1,1161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
- * accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory
- * @generated
- */
-public interface PageflowPackage extends EPackage {
- /**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "pageflow";
-
- /**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.sybase.com/suade/pageflow";
-
- /**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "pageflow";
-
- /**
- * The singleton instance of the package. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- PageflowPackage eINSTANCE = org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl
- .init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl <em>Element</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPageflowElement()
- * @generated
- */
- int PAGEFLOW_ELEMENT = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__NAME = 0;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__COMMENT = 1;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__X = 2;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__Y = 3;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__WIDTH = 4;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__HEIGHT = 5;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__ID = 6;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__REFERENCE_LINK = 7;
-
- /**
- * The number of structural features of the the '<em>Element</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT_FEATURE_COUNT = 8;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl <em>Pageflow</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPageflow()
- * @generated
- */
- int PAGEFLOW = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__NAME = PAGEFLOW_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__COMMENT = PAGEFLOW_ELEMENT__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__X = PAGEFLOW_ELEMENT__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__Y = PAGEFLOW_ELEMENT__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__WIDTH = PAGEFLOW_ELEMENT__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__HEIGHT = PAGEFLOW_ELEMENT__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__ID = PAGEFLOW_ELEMENT__ID;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__REFERENCE_LINK = PAGEFLOW_ELEMENT__REFERENCE_LINK;
-
- /**
- * The feature id for the '<em><b>Nodes</b></em>' containment reference
- * list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__NODES = PAGEFLOW_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Links</b></em>' containment reference
- * list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__LINKS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Configfile</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__CONFIGFILE = PAGEFLOW_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>Pageflow</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_FEATURE_COUNT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl <em>Node</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPageflowNode()
- * @generated
- */
- int PAGEFLOW_NODE = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__NAME = PAGEFLOW_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__COMMENT = PAGEFLOW_ELEMENT__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__X = PAGEFLOW_ELEMENT__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__Y = PAGEFLOW_ELEMENT__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__WIDTH = PAGEFLOW_ELEMENT__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__HEIGHT = PAGEFLOW_ELEMENT__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__ID = PAGEFLOW_ELEMENT__ID;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__REFERENCE_LINK = PAGEFLOW_ELEMENT__REFERENCE_LINK;
-
- /**
- * The feature id for the '<em><b>Pageflow</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__PAGEFLOW = PAGEFLOW_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Outlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__OUTLINKS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Inlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__INLINKS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>Node</em>' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE_FEATURE_COUNT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl <em>PF Link</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPFLink()
- * @generated
- */
- int PF_LINK = 2;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__NAME = PAGEFLOW_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__COMMENT = PAGEFLOW_ELEMENT__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__X = PAGEFLOW_ELEMENT__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__Y = PAGEFLOW_ELEMENT__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__WIDTH = PAGEFLOW_ELEMENT__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__HEIGHT = PAGEFLOW_ELEMENT__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__ID = PAGEFLOW_ELEMENT__ID;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__REFERENCE_LINK = PAGEFLOW_ELEMENT__REFERENCE_LINK;
-
- /**
- * The feature id for the '<em><b>Pageflow</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__PAGEFLOW = PAGEFLOW_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Target</b></em>' reference. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__TARGET = PAGEFLOW_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' reference. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__SOURCE = PAGEFLOW_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Outcome</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__OUTCOME = PAGEFLOW_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Redirect</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__REDIRECT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Bend Points</b></em>' containment
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__BEND_POINTS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Smallicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__SMALLICON = PAGEFLOW_ELEMENT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Largeicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__LARGEICON = PAGEFLOW_ELEMENT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Fromaction</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__FROMACTION = PAGEFLOW_ELEMENT_FEATURE_COUNT + 8;
-
- /**
- * The number of structural features of the the '<em>PF Link</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_FEATURE_COUNT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl <em>PF Page</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPFPage()
- * @generated
- */
- int PF_PAGE = 5;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__NAME = PAGEFLOW_NODE__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__COMMENT = PAGEFLOW_NODE__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__X = PAGEFLOW_NODE__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__Y = PAGEFLOW_NODE__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__WIDTH = PAGEFLOW_NODE__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__HEIGHT = PAGEFLOW_NODE__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__ID = PAGEFLOW_NODE__ID;
-
- /**
- * The feature id for the '<em><b>Pageflow</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__PAGEFLOW = PAGEFLOW_NODE__PAGEFLOW;
-
- /**
- * The feature id for the '<em><b>Outlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__OUTLINKS = PAGEFLOW_NODE__OUTLINKS;
-
- /**
- * The feature id for the '<em><b>Inlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__INLINKS = PAGEFLOW_NODE__INLINKS;
-
- /**
- * The feature id for the '<em><b>Path</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__PATH = PAGEFLOW_NODE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Smallicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__SMALLICON = PAGEFLOW_NODE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Largeicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__LARGEICON = PAGEFLOW_NODE_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>PF Page</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE_FEATURE_COUNT = PAGEFLOW_NODE_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl <em>PF Link Bendpoint</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPFLinkBendpoint()
- * @generated
- */
- int PF_LINK_BENDPOINT = 8;
-
- /**
- * The feature id for the '<em><b>D1 Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D1_WIDTH = 0;
-
- /**
- * The feature id for the '<em><b>D1 Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D1_HEIGHT = 1;
-
- /**
- * The feature id for the '<em><b>D2 Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D2_WIDTH = 2;
-
- /**
- * The feature id for the '<em><b>D2 Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D2_HEIGHT = 3;
-
- /**
- * The feature id for the '<em><b>Weight</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__WEIGHT = 4;
-
- /**
- * The feature id for the '<em><b>Link</b></em>' container reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__LINK = 5;
-
- /**
- * The number of structural features of the the '<em>PF Link Bendpoint</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT_FEATURE_COUNT = 6;
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Pageflow</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow
- * @generated
- */
- EClass getPageflow();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes <em>Nodes</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Nodes</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes()
- * @see #getPageflow()
- * @generated
- */
- EReference getPageflow_Nodes();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks <em>Links</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Links</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks()
- * @see #getPageflow()
- * @generated
- */
- EReference getPageflow_Links();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile <em>Configfile</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Configfile</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile()
- * @see #getPageflow()
- * @generated
- */
- EAttribute getPageflow_Configfile();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode <em>Node</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Node</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode
- * @generated
- */
- EClass getPageflowNode();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Pageflow</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow()
- * @see #getPageflowNode()
- * @generated
- */
- EReference getPageflowNode_Pageflow();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks <em>Outlinks</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Outlinks</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks()
- * @see #getPageflowNode()
- * @generated
- */
- EReference getPageflowNode_Outlinks();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks <em>Inlinks</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Inlinks</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks()
- * @see #getPageflowNode()
- * @generated
- */
- EReference getPageflowNode_Inlinks();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink <em>PF Link</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>PF Link</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink
- * @generated
- */
- EClass getPFLink();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Pageflow</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_Pageflow();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Target</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_Target();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Source</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_Source();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Outcome</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome()
- * @see #getPFLink()
- * @generated
- */
- EAttribute getPFLink_Outcome();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Outcome</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome()
- * @see #getPFLink()
- * @generated
- */
- EAttribute getPFLink_Fromaction();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect <em>Redirect</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Redirect</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect()
- * @see #getPFLink()
- * @generated
- */
- EAttribute getPFLink_Redirect();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints <em>Bend Points</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Bend Points</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_BendPoints();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement <em>Element</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Element</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement
- * @generated
- */
- EClass getPageflowElement();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName <em>Name</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment <em>Comment</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Comment</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Comment();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX <em>X</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>X</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_X();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY <em>Y</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Y</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Y();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth <em>Width</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Width</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight <em>Height</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Height</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Height();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId <em>Id</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage <em>PF Page</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>PF Page</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage
- * @generated
- */
- EClass getPFPage();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath <em>Path</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Path</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath()
- * @see #getPFPage()
- * @generated
- */
- EAttribute getPFPage_Path();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon <em>Smallicon</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Smallicon</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon()
- * @see #getPFPage()
- * @generated
- */
- EAttribute getPFPage_Smallicon();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon <em>Largeicon</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Largeicon</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon()
- * @see #getPFPage()
- * @generated
- */
- EAttribute getPFPage_Largeicon();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint <em>PF Link Bendpoint</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>PF Link Bendpoint</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint
- * @generated
- */
- EClass getPFLinkBendpoint();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width <em>D1 Width</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D1 Width</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D1Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height <em>D1 Height</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D1 Height</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D1Height();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width <em>D2 Width</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D2 Width</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D2Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height <em>D2 Height</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D2 Height</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D2Height();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight <em>Weight</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Weight</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_Weight();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Link</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EReference getPFLinkBendpoint_Link();
-
- /**
- * Returns the factory that creates the instances of the model. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- PageflowFactory getPageflowFactory();
-
-}
-// PageflowPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java
deleted file mode 100644
index b6cecb55e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PF Page</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath <em>Path</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon <em>Largeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage()
- * @model
- * @generated
- */
-public interface PageflowPage extends PageflowNode {
- /**
- * Returns the value of the '<em><b>Path</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Path</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Path</em>' attribute.
- * @see #setPath(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage_Path()
- * @model
- * @generated
- */
- String getPath();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath <em>Path</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Path</em>' attribute.
- * @see #getPath()
- * @generated
- */
- void setPath(String value);
-
- /**
- * Returns the value of the '<em><b>Smallicon</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Smallicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Smallicon</em>' attribute.
- * @see #setSmallicon(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage_Smallicon()
- * @model
- * @generated
- */
- String getSmallicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon <em>Smallicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Smallicon</em>' attribute.
- * @see #getSmallicon()
- * @generated
- */
- void setSmallicon(String value);
-
- /**
- * Returns the value of the '<em><b>Largeicon</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Largeicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Largeicon</em>' attribute.
- * @see #setLargeicon(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage_Largeicon()
- * @model
- * @generated
- */
- String getLargeicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon <em>Largeicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Largeicon</em>' attribute.
- * @see #getLargeicon()
- * @generated
- */
- void setLargeicon(String value);
-
-}
-// PFPage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java
deleted file mode 100644
index 1938bcabc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FromActionType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromOutcomeType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.RedirectType;
-import org.eclipse.jst.jsf.facesconfig.emf.SmallIconType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * The reference element represents a mapping from pageflow link to a navigation
- * case.
- *
- * @author hmeng
- */
-
-public class LinkReferenceElement extends ReferenceElement {
-
- public void add(EObject object) {
- Assert.isTrue(object instanceof NavigationCaseType);
- clear();
- super.add(object);
- }
-
- public LinkReferenceElement(PageflowElement pageflowElement) {
- super(pageflowElement);
- // TODO Auto-generated constructor stub
- }
-
- public LinkReferenceElement(PageflowElement pageflowElement,
- EObject facesConfigObject) {
- super(pageflowElement, facesConfigObject);
- // TODO Auto-generated constructor stub
- }
-
- public void update() {
- for (Iterator nodes = getData().iterator(); nodes.hasNext();) {
- Object next = nodes.next();
- if (!TransformUtil.isValidFacesConfigElement((EObject) next)) {
- nodes.remove();
- }
- }
- }
-
- public Object get(int eFeature) {
- Object result = null;
- switch (eFeature) {
- case PageflowPackage.PF_LINK__COMMENT:
- break;
- case PageflowPackage.PF_LINK__OUTCOME:
- if (!isEmpty()) {
- FromOutcomeType outcome = ((NavigationCaseType) getData()
- .get(0)).getFromOutcome();
- if (outcome != null) {
- result = outcome.getTextContent();
- }
- }
- break;
- case PageflowPackage.PF_LINK__NAME:
- break;
- case PageflowPackage.PF_LINK__REDIRECT:
- result = new Boolean(false);
- if (!isEmpty()) {
- RedirectType outcome = ((NavigationCaseType) getData().get(0))
- .getRedirect();
- if (outcome != null) {
- result = new Boolean(true);
- }
- }
- break;
-
- case PageflowPackage.PF_LINK__FROMACTION:
- if (!isEmpty()) {
- FromActionType fromActionType = ((NavigationCaseType) getData()
- .get(0)).getFromAction();
- if (fromActionType != null) {
- result = fromActionType.getTextContent();
- }
- }
- break;
- case PageflowPackage.PF_LINK__SMALLICON:
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getSmallIcon() != null ? ((IconType) icons
- .get(0)).getSmallIcon().getTextContent()
- : null;
- }
- }
- break;
- case PageflowPackage.PF_LINK__LARGEICON:
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getLargeIcon() != null ? ((IconType) icons
- .get(0)).getLargeIcon().getTextContent()
- : null;
- }
- }
- break;
- }
- return result;
- }
-
- public void set(EStructuralFeature eFeature, Object newVal) {
- switch (eFeature.getFeatureID()) {
- case PageflowPackage.PF_LINK__COMMENT:
- break;
- case PageflowPackage.PF_LINK__OUTCOME: {
- FromOutcomeType oldOutcome = null;
- FromOutcomeType newOutcome = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- oldOutcome = ((NavigationCaseType) getData().get(0))
- .getFromOutcome();
- if (newValue == null || newValue.length() == 0) {
- ((NavigationCaseType) getData().get(0))
- .setFromOutcome(null);
- } else {
- if (oldOutcome == null) {
- newOutcome = FacesConfigFactory.eINSTANCE
- .createFromOutcomeType();
- newOutcome.setTextContent(newValue);
- ((NavigationCaseType) getData().get(0))
- .setFromOutcome(newOutcome);
- } else {
- oldOutcome.setTextContent(newValue);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_LINK__NAME:
- break;
- case PageflowPackage.PF_LINK__REDIRECT:
- RedirectType redirect = null;
- RedirectType oldRedirect = null;
- boolean newRedirect = ((Boolean) newVal).booleanValue();
- if (!isEmpty()) {
- oldRedirect = ((NavigationCaseType) getData().get(0))
- .getRedirect();
- if (!newRedirect) {
- redirect = null;
- } else {
- if (oldRedirect == null) {
- redirect = FacesConfigFactory.eINSTANCE
- .createRedirectType();
- }
- }
- ((NavigationCaseType) getData().get(0)).setRedirect(redirect);
- }
- break;
- case PageflowPackage.PF_LINK__FROMACTION:
- FromActionType oldFromActionType,
- newFromActionType;
- String newFromaction = (String) newVal;
- if (!isEmpty()) {
- oldFromActionType = ((NavigationCaseType) getData().get(0))
- .getFromAction();
- if (newFromaction == null || newFromaction.length() == 0) {
- ((NavigationCaseType) getData().get(0)).setFromAction(null);
- } else {
- if (oldFromActionType == null) {
- newFromActionType = FacesConfigFactory.eINSTANCE
- .createFromActionType();
- newFromActionType.setTextContent(newFromaction);
- ((NavigationCaseType) getData().get(0))
- .setFromAction(newFromActionType);
- } else {
- oldFromActionType.setTextContent(newFromaction);
- }
- }
- }
- break;
- case PageflowPackage.PF_LINK__SMALLICON: {
- SmallIconType oldSmallicon = null;
- SmallIconType newSmallIconType = null;
- IconType icon = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getSmallIcon() != null) {
- ((IconType) icons.get(0)).setSmallIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE.createIconType();
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon.setSmallIcon(newSmallIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getSmallIcon() == null) {
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setSmallIcon(newSmallIconType);
- } else {
- oldSmallicon = ((IconType) icons.get(0)).getSmallIcon();
- oldSmallicon.setTextContent(newValue);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_LINK__LARGEICON: {
- String newValue = (String) newVal;
- LargeIconType oldLargeIcon = null;
- LargeIconType newLargeIconType = null;
- IconType icon = null;
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getLargeIcon() != null) {
- ((IconType) icons.get(0)).setLargeIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE.createIconType();
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon.setLargeIcon(newLargeIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getLargeIcon() == null) {
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setLargeIcon(newLargeIconType);
- } else {
- oldLargeIcon = ((IconType) icons.get(0)).getLargeIcon();
- oldLargeIcon.setTextContent(newValue);
- }
- }
- }
- break;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java
deleted file mode 100644
index bca363ce8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.emf.SmallIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.ToViewIdType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * The reference element represents a mapping from pageflow page to one or more
- * navigation rules/cases's view IDs (fromViewID or toViewID).
- *
- * @author hmeng
- */
-
-public class PageReferenceElement extends ReferenceElement {
-
- public PageReferenceElement(PageflowElement pageflowElement) {
- super(pageflowElement);
- // TODO Auto-generated constructor stub
- }
-
- public PageReferenceElement(PageflowElement pageflowElement,
- EObject facesConfigObject) {
- super(pageflowElement, facesConfigObject);
- // TODO Auto-generated constructor stub
- }
-
- public void add(EObject object) {
- Assert.isTrue(object instanceof FromViewIdType
- || object instanceof ToViewIdType);
- super.add(object);
- }
-
- public void update() {
- outer: for (Iterator nodes = getData().iterator(); nodes.hasNext();) {
- Object next = nodes.next();
- if (next instanceof FromViewIdType) {
- if (!TransformUtil.isValidFacesConfigElement((EObject) next)) {
- nodes.remove();
- continue;
- }
- List links = ((PageflowPage) pageflowElement).getOutlinks();
- for (int i = 0; i < links.size(); i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- if (!link.getFCElements().isEmpty()
- && TransformUtil
- .isValidFacesConfigElement((NavigationCaseType) ((PageflowLink) links
- .get(i)).getFCElements().getData()
- .get(0))) {
- NavigationRuleType rule = (NavigationRuleType) ((NavigationCaseType) ((PageflowLink) links
- .get(i)).getFCElements().getData().get(0))
- .eContainer();
- if (rule == null || rule.getFromViewId() == next) {
- // There navigation case
- // matching this end.
- continue outer;
- }
- }
- }
- // No case contains this end.
- nodes.remove();
- } else if (next instanceof ToViewIdType) {
- if (!TransformUtil.isValidFacesConfigElement((EObject) next)) {
- nodes.remove();
- continue;
- }
- // Verify this is case end.
- List links = ((PageflowPage) pageflowElement).getInlinks();
- for (int i = 0; i < links.size(); i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- if (!link.getFCElements().isEmpty()
- && TransformUtil
- .isValidFacesConfigElement((NavigationCaseType) link
- .getFCElements().getData().get(0))) {
- if (((NavigationCaseType) ((PageflowLink) links.get(i))
- .getFCElements().getData().get(0))
- .getToViewId() == next) {
- // There navigation case
- // matching this end.
- continue outer;
- }
- }
- }
- // No case contains this end.
- nodes.remove();
- }
- }
- }
-
- public Object get(int eFeature) {
- Object result = null;
- switch (eFeature) {
- case PageflowPackage.PF_PAGE__COMMENT:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List descriptions = rule.getDescription();
- if (descriptions.size() > 0) {
- result = ((DescriptionType) descriptions.get(0))
- .getTextContent();
- break;
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__LARGEICON:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getLargeIcon() != null ? ((IconType) icons
- .get(0)).getLargeIcon().getTextContent()
- : null;
- break;
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__NAME:
- // To see if it is in navigation rule.
- if (!isEmpty() && !isEndOnly()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List displaynames = rule.getDisplayName();
- if (displaynames.size() > 0) {
- result = ((DisplayNameType) displaynames.get(0))
- .getTextContent();
- break;
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__PATH:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- if (getData().get(i) instanceof FromViewIdType) {
- result = ((FromViewIdType) getData().get(i))
- .getTextContent();
- break;
- }
- }
- if (result == null && getData().get(0) instanceof ToViewIdType) {
- result = ((ToViewIdType) getData().get(0)).getTextContent();
- }
- }
- break;
- case PageflowPackage.PF_PAGE__SMALLICON:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getSmallIcon() != null ? ((IconType) icons
- .get(0)).getSmallIcon().getTextContent()
- : null;
- break;
- }
- }
- }
- }
- break;
- }
- return result;
- }
-
- public NavigationRuleType resolveRuleFromFCElement(Object object) {
- if (object instanceof FromViewIdType) {
- return (NavigationRuleType) ((FromViewIdType) object).eContainer();
- }
- return null;
- }
-
- public NavigationRuleType resolveRuleFromPFElement(Object object) {
- if (object instanceof PageflowLink) {
- NavigationCaseType caseType = (NavigationCaseType) ((PageflowLink) object)
- .getFCElements().getData().get(0);
- return (NavigationRuleType) caseType.eContainer();
- }
- return null;
- }
-
- public void set(EStructuralFeature eFeature, Object newVal) {
- switch (eFeature.getFeatureID()) {
- case PageflowPackage.PF_PAGE__COMMENT: {
- DescriptionType description = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- rule.getDescription().clear();
- description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newValue);
- rule.getDescription().add(description);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_PAGE__LARGEICON: {
- LargeIconType oldLargeIcon = null;
- LargeIconType newLargeIconType = null;
- IconType icon = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getLargeIcon() != null) {
- ((IconType) icons.get(0))
- .setLargeIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE
- .createIconType();
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon.setLargeIcon(newLargeIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getLargeIcon() == null) {
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setLargeIcon(newLargeIconType);
- } else {
- oldLargeIcon = ((IconType) icons.get(0))
- .getLargeIcon();
- oldLargeIcon.setTextContent(newValue);
- }
- }
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_PAGE__NAME:
- DisplayNameType newDisplayNameType = null;
- String newName = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- rule.getDisplayName().clear();
- if (newName != null && newName.length() > 0) {
- newDisplayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- newDisplayNameType.setTextContent(newName);
- rule.getDisplayName().add(newDisplayNameType);
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__PATH: {
- Object oldPath = null;
- Object newPath = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- if (getData().get(i) instanceof FromViewIdType) {
- oldPath = getData().get(i);
- ((FromViewIdType) oldPath).setTextContent(newValue);
- } else if (getData().get(i) instanceof ToViewIdType) {
- oldPath = getData().get(i);
- ((ToViewIdType) oldPath).setTextContent(newValue);
- }
- }
- }
- // Create new fromViewID or toViewID node as needed.
- else if (newValue != null && !"*".equals(newValue)) {
- if (((PageflowPage) pageflowElement).getOutlinks().size() > 0) {
- List links = ((PageflowPage) pageflowElement).getOutlinks();
- for (int i = 0, n = links.size(); i < n; i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- NavigationRuleType rule = resolveRuleFromPFElement(link);
- newPath = FC2PFTransformer.createRLFromViewID(newValue);
- rule.setFromViewId((FromViewIdType) newPath);
- add((EObject) newPath);
- }
- links = ((PageflowPage) pageflowElement).getInlinks();
- for (int i = 0, n = links.size(); i < n; i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- NavigationCaseType caseType = (NavigationCaseType) link
- .getFCElements().getData().get(0);
- newPath = FC2PFTransformer.createFCToViewID(newValue);
- caseType.setToViewId((ToViewIdType) newPath);
- add((EObject) newPath);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_PAGE__SMALLICON: {
- SmallIconType oldSmallicon = null;
- SmallIconType newSmallIconType = null;
- IconType icon = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getSmallIcon() != null) {
- ((IconType) icons.get(0))
- .setSmallIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE
- .createIconType();
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon.setSmallIcon(newSmallIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getSmallIcon() == null) {
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setSmallIcon(newSmallIconType);
- } else {
- oldSmallicon = ((IconType) icons.get(0))
- .getSmallIcon();
- oldSmallicon.setTextContent(newValue);
- }
- }
- }
- }
- }
- break;
- }
- }
- }
-
- public boolean isEndOnly() {
- for (int i = 0, n = getData().size(); i < n; i++) {
- if (getData().get(i) instanceof FromViewIdType) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java
deleted file mode 100644
index eb7c4b86f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getHeight <em>Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class PageflowElementImpl extends EObjectImpl implements
- PageflowElement {
- protected static final String idPrefix = "pf";
-
- protected String id;
-
- protected static int counter = 0;
-
- protected ReferenceElement refElement;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = "unnamed";
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getComment() <em>Comment</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getComment()
- * @generated
- * @ordered
- */
- protected static final String COMMENT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getComment() <em>Comment</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getComment()
- * @generated
- * @ordered
- */
- protected String comment = COMMENT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getX() <em>X</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getX()
- * @generated
- * @ordered
- */
- protected static final int X_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getX() <em>X</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getX()
- * @generated
- * @ordered
- */
- protected int x = X_EDEFAULT;
-
- /**
- * The default value of the '{@link #getY() <em>Y</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getY()
- * @generated
- * @ordered
- */
- protected static final int Y_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getY() <em>Y</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getY()
- * @generated
- * @ordered
- */
- protected int y = Y_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWidth() <em>Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWidth()
- * @generated
- * @ordered
- */
- protected static final int WIDTH_EDEFAULT = -1;
-
- /**
- * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWidth()
- * @generated
- * @ordered
- */
- protected int width = WIDTH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getHeight() <em>Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getHeight()
- * @generated
- * @ordered
- */
- protected static final int HEIGHT_EDEFAULT = -1;
-
- /**
- * The default value of the '{@link #getReferenceLink() <em>Reference Link</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getReferenceLink()
- * @generated
- * @ordered
- */
- protected static final String REFERENCE_LINK_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getReferenceLink() <em>Reference Link</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getReferenceLink()
- * @generated
- * @ordered
- */
- protected String referenceLink = REFERENCE_LINK_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getHeight() <em>Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getHeight()
- * @generated
- * @ordered
- */
- protected int height = HEIGHT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowElementImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPageflowElement();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getName() {
- return name == null || name.length() == 0 ? NAME_EDEFAULT : name;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getComment() {
- return comment;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setComment(String newComment) {
- String oldComment = comment;
- comment = newComment;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__COMMENT, oldComment,
- comment));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getX() {
- return x;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setX(int newX) {
- int oldX = x;
- x = newX;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__X, oldX, x));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getY() {
- return y;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setY(int newY) {
- int oldY = y;
- y = newY;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__Y, oldY, y));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getWidth() {
- return width;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setWidth(int newWidth) {
- int oldWidth = width;
- width = newWidth;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__WIDTH, oldWidth, width));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getHeight() {
- return height;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setHeight(int newHeight) {
- int oldHeight = height;
- height = newHeight;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT, oldHeight, height));
- }
-
- /**
- * Generate (and cache) an id as needed
- *
- * @generated NOT
- */
- public String getId() {
- if (id == null) {
- id = generateId();
- }
- return id;
- }
-
- /**
- * Generate a random id based on the current time
- *
- * @return the generated id
- *
- * @generated NOT
- */
- public synchronized String generateId() {
- long current = System.currentTimeMillis();
- return idPrefix + current + counter++;
- }
-
- /**
- * Set or generate an Id This method should not be called except when
- * populating from the serialization
- *
- * @generated NOT
- */
- public void setId(String newId) {
- if (newId == null && id == null) {
- id = generateId();
- } else {
- id = newId;
- }
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getReferenceLink() {
- return referenceLink;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setReferenceLink(String newReferenceLink) {
- String oldReferenceLink = referenceLink;
- referenceLink = newReferenceLink;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK,
- oldReferenceLink, referenceLink));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- return getName();
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- return getComment();
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- return new Integer(getX());
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- return new Integer(getY());
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- return getId();
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- return getReferenceLink();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- setReferenceLink((String) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- setReferenceLink(REFERENCE_LINK_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- return REFERENCE_LINK_EDEFAULT == null ? referenceLink != null
- : !REFERENCE_LINK_EDEFAULT.equals(referenceLink);
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
- result.append(name);
- result.append(", comment: ");
- result.append(comment);
- result.append(", x: ");
- result.append(x);
- result.append(", y: ");
- result.append(y);
- result.append(", width: ");
- result.append(width);
- result.append(", height: ");
- result.append(height);
- result.append(", referenceLink: ");
- result.append(referenceLink);
- result.append(')');
- return result.toString();
- }
-
- /**
- * The synchronizer will use this to notify adapters for the faces-config's
- * modification.
- *
- * @generated NOT
- */
- public void notifyModelChanged(Notification notification) {
- if (eNotificationRequired())
- eNotify(notification);
- }
-
- /**
- * @generated NOT
- */
-
- public ReferenceElement getFCElements() {
- return null;
- }
-
- /**
- * @generated NOT
- */
- public void update() {
- getFCElements().update();
- if (!TransformUtil.isValidPageflowElement(this)) {
- eAdapters().clear();
- }
- }
-
- /**
- * @generated NOT
- */
- public void dispose() {
- getFCElements().dispose();
- eAdapters.clear();
- }
-
-}
-// PageflowElementImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java
deleted file mode 100644
index 5dcc2ee76..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class PageflowFactoryImpl extends EFactoryImpl implements
- PageflowFactory {
- /**
- * Creates and instance of the factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PageflowFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case PageflowPackage.PAGEFLOW:
- return createPageflow();
- case PageflowPackage.PF_LINK:
- return createPFLink();
- case PageflowPackage.PF_PAGE:
- return createPFPage();
- case PageflowPackage.PF_LINK_BENDPOINT:
- return createPFLinkBendpoint();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName()
- + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Pageflow createPageflow() {
- PageflowImpl pageflow = new PageflowImpl();
- return pageflow;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowLink createPFLink() {
- PageflowLinkImpl pfLink = new PageflowLinkImpl();
- return pfLink;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowPage createPFPage() {
- PageflowPageImpl pfPage = new PageflowPageImpl();
- return pfPage;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowLinkBendpoint createPFLinkBendpoint() {
- PageflowLinkBendpointImpl pfLinkBendpoint = new PageflowLinkBendpointImpl();
- return pfLinkBendpoint;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowPackage getPageflowPackage() {
- return (PageflowPackage) getEPackage();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @deprecated
- * @generated
- */
- public static PageflowPackage getPackage() {
- return PageflowPackage.eINSTANCE;
- }
-
-}
-// PageflowFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java
deleted file mode 100644
index e535cedb5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Pageflow</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl#getNodes <em>Nodes</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl#getLinks <em>Links</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl#getConfigfile <em>Configfile</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PageflowImpl extends PageflowElementImpl implements Pageflow {
-
- /**
- * The cached value of the '{@link #getNodes() <em>Nodes</em>}'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getNodes()
- * @generated
- * @ordered
- */
- protected EList nodes = null;
-
- /**
- * The cached value of the '{@link #getLinks() <em>Links</em>}'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLinks()
- * @generated
- * @ordered
- */
- protected EList links = null;
-
- /**
- * The default value of the '{@link #getConfigfile() <em>Configfile</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getConfigfile()
- * @generated
- * @ordered
- */
- protected static final String CONFIGFILE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfigfile() <em>Configfile</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getConfigfile()
- * @generated
- * @ordered
- */
- protected String configfile = CONFIGFILE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPageflow();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getNodes() {
- if (nodes == null) {
- nodes = new EObjectContainmentWithInverseEList(PageflowNode.class,
- this, PageflowPackage.PAGEFLOW__NODES,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW);
- }
- return nodes;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getLinks() {
- if (links == null) {
- links = new EObjectContainmentWithInverseEList(PageflowLink.class,
- this, PageflowPackage.PAGEFLOW__LINKS,
- PageflowPackage.PF_LINK__PAGEFLOW);
- }
- return links;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getConfigfile() {
- return configfile;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setConfigfile(String newConfigfile) {
- String oldConfigfile = configfile;
- configfile = newConfigfile;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW__CONFIGFILE, oldConfigfile,
- configfile));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW__NODES:
- return ((InternalEList) getNodes()).basicAdd(otherEnd, msgs);
- case PageflowPackage.PAGEFLOW__LINKS:
- return ((InternalEList) getLinks()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW__NODES:
- return ((InternalEList) getNodes()).basicRemove(otherEnd, msgs);
- case PageflowPackage.PAGEFLOW__LINKS:
- return ((InternalEList) getLinks()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- return getName();
- case PageflowPackage.PAGEFLOW__COMMENT:
- return getComment();
- case PageflowPackage.PAGEFLOW__X:
- return new Integer(getX());
- case PageflowPackage.PAGEFLOW__Y:
- return new Integer(getY());
- case PageflowPackage.PAGEFLOW__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PAGEFLOW__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PAGEFLOW__ID:
- return getId();
- case PageflowPackage.PAGEFLOW__NODES:
- return getNodes();
- case PageflowPackage.PAGEFLOW__LINKS:
- return getLinks();
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- return getConfigfile();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW__NODES:
- getNodes().clear();
- getNodes().addAll((Collection) newValue);
- return;
- case PageflowPackage.PAGEFLOW__LINKS:
- getLinks().clear();
- getLinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- setConfigfile((String) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__NODES:
- getNodes().clear();
- return;
- case PageflowPackage.PAGEFLOW__LINKS:
- getLinks().clear();
- return;
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- setConfigfile(CONFIGFILE_EDEFAULT);
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PAGEFLOW__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PAGEFLOW__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PAGEFLOW__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PAGEFLOW__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PAGEFLOW__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PAGEFLOW__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PAGEFLOW__NODES:
- return nodes != null && !nodes.isEmpty();
- case PageflowPackage.PAGEFLOW__LINKS:
- return links != null && !links.isEmpty();
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- return CONFIGFILE_EDEFAULT == null ? configfile != null
- : !CONFIGFILE_EDEFAULT.equals(configfile);
- }
- return super.eIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (configfile: ");
- result.append(configfile);
- result.append(')');
- return result.toString();
- }
-
- /**
- * set the valid link's source and target node.
- *
- * @generated NOT
- */
- public void connect(PageflowNode source, PageflowNode target,
- PageflowLink link) {
- if (link != null) {
- if (PageflowValidation.getInstance().isValidLinkForCreation(source,
- target)) {
- this.getLinks().add(link);
- link.setSource(source);
- link.setTarget(target);
- }
- }
- }
-
- /** node prefixs map */
- private HashMap mapNodePrefix = null;
-
- /**
- * get the prefix's map, and if the map is not existed, create it.
- *
- * @return - map for prefix
- *
- * @generated NOT
- */
- private HashMap getNodePrefixMap() {
- if (mapNodePrefix == null) {
- mapNodePrefix = new HashMap();
- mapNodePrefix.put(PageflowPageImpl.class, new String("Page"));
- }
- return mapNodePrefix;
- }
-
- /**
- * get the default node name according current nodetype
- *
- * @param nodeType -
- * node type, such as PFBeginImpl, PFPageImpl, etc.
- * @return - the default node name.
- *
- * @generated NOT
- */
- public String getDefaultNodeName(Class nodeType) {
- HashMap mapNodePrefix = getNodePrefixMap();
-
- String strNodePrefix = (String) mapNodePrefix.get(nodeType);
-
- String strNodeName = null;
- boolean bFound = true;
- int numNode = 1;
- while (bFound) {
- strNodeName = strNodePrefix + numNode;
- boolean bExisted = false;
- for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
- PageflowNode node = (PageflowNode) iter.next();
- if (strNodeName.equalsIgnoreCase(node.getName())) {
- bExisted = true;
- break;
- }
- }
- if (!bExisted) {
- bFound = false;
- }
- numNode++;
- }
-
- return strNodeName;
-
- }
-
- /**
- * When faces-config has been changed, the pageflow model will be notified
- * to enable refresher do some update in pageflow.
- *
- * @generated NOT
- */
- public void notifyModelChanged(Notification notification) {
- TreeIterator children = eAllContents();
- while (children.hasNext()) {
- Object next = children.next();
- if (next instanceof PageflowElement) {
- ((PageflowElement) next).update();
- }
- }
- super.notifyModelChanged(notification);
- }
-
- /**
- * @generated NOT
- */
- public void dispose() {
- TreeIterator children = eAllContents();
- while (children.hasNext()) {
- Object next = children.next();
- if (next instanceof PageflowElement) {
- ((PageflowElement) next).dispose();
- }
- }
- eAdapters.clear();
- }
-}
-// PageflowImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java
deleted file mode 100644
index c35287462..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>PF Link Bendpoint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD1Width <em>D1 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD1Height <em>D1 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD2Width <em>D2 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD2Height <em>D2 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getWeight <em>Weight</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getLink <em>Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PageflowLinkBendpointImpl extends EObjectImpl implements PageflowLinkBendpoint {
- /**
- * The default value of the '{@link #getD1Width() <em>D1 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Width()
- * @generated
- * @ordered
- */
- protected static final int D1_WIDTH_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD1Width() <em>D1 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Width()
- * @generated
- * @ordered
- */
- protected int d1Width = D1_WIDTH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getD1Height() <em>D1 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Height()
- * @generated
- * @ordered
- */
- protected static final int D1_HEIGHT_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD1Height() <em>D1 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Height()
- * @generated
- * @ordered
- */
- protected int d1Height = D1_HEIGHT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getD2Width() <em>D2 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Width()
- * @generated
- * @ordered
- */
- protected static final int D2_WIDTH_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD2Width() <em>D2 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Width()
- * @generated
- * @ordered
- */
- protected int d2Width = D2_WIDTH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getD2Height() <em>D2 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Height()
- * @generated
- * @ordered
- */
- protected static final int D2_HEIGHT_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD2Height() <em>D2 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Height()
- * @generated
- * @ordered
- */
- protected int d2Height = D2_HEIGHT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWeight() <em>Weight</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWeight()
- * @generated
- * @ordered
- */
- protected static final float WEIGHT_EDEFAULT = 0.5F;
-
- /**
- * The cached value of the '{@link #getWeight() <em>Weight</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWeight()
- * @generated
- * @ordered
- */
- protected float weight = WEIGHT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- private Dimension dimStart, dimEnd;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowLinkBendpointImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPFLinkBendpoint();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD1Width() {
- return d1Width;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD1Width(int newD1Width) {
- int oldD1Width = d1Width;
- d1Width = newD1Width;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH, oldD1Width,
- d1Width));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD1Height() {
- return d1Height;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD1Height(int newD1Height) {
- int oldD1Height = d1Height;
- d1Height = newD1Height;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT, oldD1Height,
- d1Height));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD2Width() {
- return d2Width;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD2Width(int newD2Width) {
- int oldD2Width = d2Width;
- d2Width = newD2Width;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH, oldD2Width,
- d2Width));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD2Height() {
- return d2Height;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD2Height(int newD2Height) {
- int oldD2Height = d2Height;
- d2Height = newD2Height;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT, oldD2Height,
- d2Height));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public float getWeight() {
- return weight;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setWeight(float newWeight) {
- float oldWeight = weight;
- weight = newWeight;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__WEIGHT, oldWeight,
- weight));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowLink getLink() {
- if (eContainerFeatureID != PageflowPackage.PF_LINK_BENDPOINT__LINK)
- return null;
- return (PageflowLink) eContainer;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setLink(PageflowLink newLink) {
- if (newLink != eContainer
- || (eContainerFeatureID != PageflowPackage.PF_LINK_BENDPOINT__LINK && newLink != null)) {
- if (EcoreUtil.isAncestor(this, newLink))
- throw new IllegalArgumentException(
- "Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newLink != null)
- msgs = ((InternalEObject) newLink).eInverseAdd(this,
- PageflowPackage.PF_LINK__BEND_POINTS, PageflowLink.class,
- msgs);
- msgs = eBasicSetContainer((InternalEObject) newLink,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, newLink, newLink));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return eBasicSetContainer(null,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return ((InternalEObject) eContainer).eInverseRemove(this,
- PageflowPackage.PF_LINK__BEND_POINTS, PageflowLink.class,
- msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return ((InternalEObject) eContainer).eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- return new Integer(getD1Width());
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- return new Integer(getD1Height());
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- return new Integer(getD2Width());
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- return new Integer(getD2Height());
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- return new Float(getWeight());
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return getLink();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- setD1Width(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- setD1Height(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- setD2Width(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- setD2Height(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- setWeight(((Float) newValue).floatValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- setLink((PageflowLink) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- setD1Width(D1_WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- setD1Height(D1_HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- setD2Width(D2_WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- setD2Height(D2_HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- setWeight(WEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- setLink((PageflowLink) null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- return d1Width != D1_WIDTH_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- return d1Height != D1_HEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- return d2Width != D2_WIDTH_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- return d2Height != D2_HEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- return weight != WEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return getLink() != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (d1Width: ");
- result.append(d1Width);
- result.append(", d1Height: ");
- result.append(d1Height);
- result.append(", d2Width: ");
- result.append(d2Width);
- result.append(", d2Height: ");
- result.append(d2Height);
- result.append(", weight: ");
- result.append(weight);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getFirstRelativeDimension() {
- dimStart = new Dimension(getD1Width(), getD1Height());
- return dimStart;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getSecondRelativeDimension() {
- dimEnd = new Dimension(getD2Width(), getD2Height());
- return dimEnd;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setRelativeDimensions(Dimension dim1, Dimension dim2) {
- dimStart = dim1;
- dimEnd = dim2;
- setD1Width(dimStart.width);
- setD1Height(dimStart.height);
-
- setD2Width(dimEnd.width);
- setD2Height(dimEnd.height);
- }
-
-}
-// PFLinkBendpointImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java
deleted file mode 100644
index 73fa755a7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java
+++ /dev/null
@@ -1,878 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>PF Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getTarget <em>Target</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getOutcome <em>Outcome</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#isRedirect <em>Redirect</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getBendPoints <em>Bend Points</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getLargeicon <em>Largeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- *
- */
-public class PageflowLinkImpl extends PageflowElementImpl implements
- PageflowLink {
- /**
- * The cached value of the '{@link #getTarget() <em>Target</em>}'
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getTarget()
- * @generated
- * @ordered
- */
- protected PageflowNode target = null;
-
- /**
- * The cached value of the '{@link #getSource() <em>Source</em>}'
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected PageflowNode source = null;
-
- /**
- * The default value of the '{@link #getOutcome() <em>Outcome</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getOutcome()
- * @generated
- * @ordered
- */
- protected static final String OUTCOME_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #isRedirect() <em>Redirect</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #isRedirect()
- * @generated
- * @ordered
- */
- protected static final boolean REDIRECT_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #getBendPoints() <em>Bend Points</em>}'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getBendPoints()
- * @generated
- * @ordered
- */
- protected EList bendPoints = null;
-
- /**
- * The default value of the '{@link #getSmallicon() <em>Smallicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getSmallicon()
- * @generated
- * @ordered
- */
- protected static final String SMALLICON_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getLargeicon() <em>Largeicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLargeicon()
- * @generated
- * @ordered
- */
- protected static final String LARGEICON_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getFromaction() <em>Fromaction</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getFromaction()
- * @generated
- * @ordered
- */
- protected static final String FROMACTION_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowLinkImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPFLink();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Pageflow getPageflow() {
- if (eContainerFeatureID != PageflowPackage.PF_LINK__PAGEFLOW)
- return null;
- return (Pageflow) eContainer;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setPageflow(Pageflow newPageflow) {
- if (newPageflow != eContainer
- || (eContainerFeatureID != PageflowPackage.PF_LINK__PAGEFLOW && newPageflow != null)) {
- if (EcoreUtil.isAncestor(this, newPageflow))
- throw new IllegalArgumentException(
- "Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newPageflow != null)
- msgs = ((InternalEObject) newPageflow).eInverseAdd(this,
- PageflowPackage.PAGEFLOW__LINKS, Pageflow.class, msgs);
- msgs = eBasicSetContainer((InternalEObject) newPageflow,
- PageflowPackage.PF_LINK__PAGEFLOW, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__PAGEFLOW, newPageflow, newPageflow));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode getTarget() {
- if (target != null && target.eIsProxy()) {
- PageflowNode oldTarget = target;
- target = (PageflowNode) eResolveProxy((InternalEObject) target);
- if (target != oldTarget) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- PageflowPackage.PF_LINK__TARGET, oldTarget, target));
- }
- }
- return target;
- }
-
- public void setSourcePath(String path) {
- if (getSource() != null
- && path.equals(((PageflowPage) getSource()).getPath())) {
- return;
- }
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__SOURCE, getSource(), path));
- }
-
- public void setTargetPath(String path) {
- if (getTarget() != null
- && path.equals(((PageflowPage) getTarget()).getPath())) {
- return;
- }
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__TARGET, getTarget(), path));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode basicGetTarget() {
- return target;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetTarget(PageflowNode newTarget,
- NotificationChain msgs) {
- PageflowNode oldTarget = target;
- target = newTarget;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this,
- Notification.SET, PageflowPackage.PF_LINK__TARGET,
- oldTarget, newTarget);
- if (msgs == null)
- msgs = notification;
- else
- msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTarget(PageflowNode newTarget) {
- if (newTarget != target) {
- NotificationChain msgs = null;
- if (target != null)
- msgs = ((InternalEObject) target).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowNode.class, msgs);
- if (newTarget != null)
- msgs = ((InternalEObject) newTarget).eInverseAdd(this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowNode.class, msgs);
- msgs = basicSetTarget(newTarget, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__TARGET, newTarget, newTarget));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode getSource() {
- if (source != null && source.eIsProxy()) {
- PageflowNode oldSource = source;
- source = (PageflowNode) eResolveProxy((InternalEObject) source);
- if (source != oldSource) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- PageflowPackage.PF_LINK__SOURCE, oldSource, source));
- }
- }
- return source;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode basicGetSource() {
- return source;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetSource(PageflowNode newSource,
- NotificationChain msgs) {
- // Assert.isTrue(newSource != null);
- PageflowNode oldSource = source;
- source = newSource;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this,
- Notification.SET, PageflowPackage.PF_LINK__SOURCE,
- oldSource, newSource);
- if (msgs == null)
- msgs = notification;
- else
- msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setSource(PageflowNode newSource) {
- // Assert.isTrue(newSource != null);
- if (newSource != source) {
- NotificationChain msgs = null;
- if (source != null)
- msgs = ((InternalEObject) source).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowNode.class, msgs);
- if (newSource != null)
- msgs = ((InternalEObject) newSource).eInverseAdd(this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowNode.class, msgs);
- msgs = basicSetSource(newSource, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__SOURCE, newSource, newSource));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getBendPoints() {
- if (bendPoints == null) {
- bendPoints = new EObjectContainmentWithInverseEList(
- PageflowLinkBendpoint.class, this,
- PageflowPackage.PF_LINK__BEND_POINTS,
- PageflowPackage.PF_LINK_BENDPOINT__LINK);
- }
- return bendPoints;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK__PAGEFLOW:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PF_LINK__PAGEFLOW, msgs);
- case PageflowPackage.PF_LINK__TARGET:
- if (target != null)
- msgs = ((InternalEObject) target).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowNode.class, msgs);
- return basicSetTarget((PageflowNode) otherEnd, msgs);
- case PageflowPackage.PF_LINK__SOURCE:
- if (source != null)
- msgs = ((InternalEObject) source).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowNode.class, msgs);
- return basicSetSource((PageflowNode) otherEnd, msgs);
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return ((InternalEList) getBendPoints()).basicAdd(otherEnd,
- msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return eBasicSetContainer(null,
- PageflowPackage.PF_LINK__PAGEFLOW, msgs);
- case PageflowPackage.PF_LINK__TARGET:
- return basicSetTarget(null, msgs);
- case PageflowPackage.PF_LINK__SOURCE:
- return basicSetSource(null, msgs);
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return ((InternalEList) getBendPoints()).basicRemove(otherEnd,
- msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return ((InternalEObject) eContainer).eInverseRemove(this,
- PageflowPackage.PAGEFLOW__LINKS, Pageflow.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return ((InternalEObject) eContainer).eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- return getName();
- case PageflowPackage.PF_LINK__COMMENT:
- return getComment();
- case PageflowPackage.PF_LINK__X:
- return new Integer(getX());
- case PageflowPackage.PF_LINK__Y:
- return new Integer(getY());
- case PageflowPackage.PF_LINK__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PF_LINK__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PF_LINK__ID:
- return getId();
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return getPageflow();
- case PageflowPackage.PF_LINK__TARGET:
- if (resolve)
- return getTarget();
- return basicGetTarget();
- case PageflowPackage.PF_LINK__SOURCE:
- if (resolve)
- return getSource();
- return basicGetSource();
- case PageflowPackage.PF_LINK__OUTCOME:
- return getOutcome();
- case PageflowPackage.PF_LINK__REDIRECT:
- return isRedirect() ? Boolean.TRUE : Boolean.FALSE;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return getBendPoints();
- case PageflowPackage.PF_LINK__SMALLICON:
- return getSmallicon();
- case PageflowPackage.PF_LINK__LARGEICON:
- return getLargeicon();
- case PageflowPackage.PF_LINK__FROMACTION:
- return getFromaction();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PF_LINK__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PF_LINK__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PF_LINK__PAGEFLOW:
- setPageflow((Pageflow) newValue);
- return;
- case PageflowPackage.PF_LINK__TARGET:
- setTarget((PageflowNode) newValue);
- return;
- case PageflowPackage.PF_LINK__SOURCE:
- setSource((PageflowNode) newValue);
- return;
- case PageflowPackage.PF_LINK__OUTCOME:
- setOutcome((String) newValue);
- return;
- case PageflowPackage.PF_LINK__REDIRECT:
- setRedirect(((Boolean) newValue).booleanValue());
- return;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- getBendPoints().clear();
- getBendPoints().addAll((Collection) newValue);
- return;
- case PageflowPackage.PF_LINK__SMALLICON:
- setSmallicon((String) newValue);
- return;
- case PageflowPackage.PF_LINK__LARGEICON:
- setLargeicon((String) newValue);
- return;
- case PageflowPackage.PF_LINK__FROMACTION:
- setFromaction((String) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__PAGEFLOW:
- setPageflow((Pageflow) null);
- return;
- case PageflowPackage.PF_LINK__TARGET:
- setTarget((PageflowNode) null);
- return;
- case PageflowPackage.PF_LINK__SOURCE:
- setSource((PageflowNode) null);
- return;
- case PageflowPackage.PF_LINK__OUTCOME:
- setOutcome(OUTCOME_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__REDIRECT:
- setRedirect(REDIRECT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- getBendPoints().clear();
- return;
- case PageflowPackage.PF_LINK__SMALLICON:
- setSmallicon(SMALLICON_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__LARGEICON:
- setLargeicon(LARGEICON_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__FROMACTION:
- setFromaction(FROMACTION_EDEFAULT);
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PF_LINK__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PF_LINK__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PF_LINK__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PF_LINK__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PF_LINK__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return getPageflow() != null;
- case PageflowPackage.PF_LINK__TARGET:
- return target != null;
- case PageflowPackage.PF_LINK__SOURCE:
- return source != null;
- case PageflowPackage.PF_LINK__OUTCOME:
- return OUTCOME_EDEFAULT == null ? getOutcome() != null
- : !OUTCOME_EDEFAULT.equals(getOutcome());
- case PageflowPackage.PF_LINK__REDIRECT:
- return isRedirect() != REDIRECT_EDEFAULT;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return bendPoints != null && !bendPoints.isEmpty();
- case PageflowPackage.PF_LINK__SMALLICON:
- return SMALLICON_EDEFAULT == null ? getSmallicon() != null
- : !SMALLICON_EDEFAULT.equals(getSmallicon());
- case PageflowPackage.PF_LINK__LARGEICON:
- return LARGEICON_EDEFAULT == null ? getLargeicon() != null
- : !LARGEICON_EDEFAULT.equals(getLargeicon());
- case PageflowPackage.PF_LINK__FROMACTION:
- return FROMACTION_EDEFAULT == null ? getFromaction() != null
- : !FROMACTION_EDEFAULT.equals(getFromaction());
- }
- return super.eIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (smallicon: ");
- result.append(getSmallicon());
- result.append(", largeicon: ");
- result.append(getLargeicon());
- result.append(", fromaction: ");
- result.append(getFromaction());
- result.append(", outcome: ");
- result.append(getOutcome());
- result.append(", redirect: ");
- result.append(isRedirect());
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc --> insert a new bendpoint to the link <!--
- * end-user-doc -->
- *
- * @generated NOT
- */
- public void insertBendpoint(int index, PageflowLinkBendpoint point) {
- getBendPoints().add(index, point);
-
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.ADD,
- PageflowPackage.PF_LINK__BEND_POINTS, null, point));
- }
-
- /**
- * <!-- begin-user-doc --> remove the current bendpoint <!-- end-user-doc
- * -->
- *
- * @generated NOT
- */
- public void removeBendpoint(int index) {
- getBendPoints().remove(index);
- }
-
- /**
- * <!-- begin-user-doc --> Set the current bendpoint <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoint(int index, PageflowLinkBendpoint point) {
- getBendPoints().set(index, point);
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__BEND_POINTS, null, point));
-
- }
-
- /**
- * <!-- begin-user-doc --> Set a group of bendpoints to reconstruct the link
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoints(Vector points) {
- bendPoints = (EList) points;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.ADD_MANY,
- PageflowPackage.PF_LINK__BEND_POINTS, null, points));
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public boolean isRedirect() {
- Boolean result = (Boolean) getFCElements().get(
- PageflowPackage.PF_LINK__REDIRECT);
- return result.booleanValue();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setRedirect(boolean newRedirect) {
- Boolean oldRedirect = new Boolean(isRedirect());
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__REDIRECT, oldRedirect,
- new Boolean(newRedirect)));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getOutcome() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__OUTCOME);
-
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setOutcome(String newValue) {
- String oldOutcome = getOutcome();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__OUTCOME, oldOutcome, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getSmallicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__SMALLICON);
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setSmallicon(String newValue) {
- String oldSmallicon = getSmallicon();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__SMALLICON, oldSmallicon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getLargeicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__LARGEICON);
-
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setLargeicon(String newValue) {
- String oldLargeIcon = getLargeicon();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__LARGEICON, oldLargeIcon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getFromaction() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__FROMACTION);
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setFromaction(String newFromaction) {
- String oldFromActionType = getFromaction();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__FROMACTION, oldFromActionType,
- newFromaction));
- }
-
- /**
- * @generated NOT
- */
- public ReferenceElement getFCElements() {
-
- if (refElement == null) {
- refElement = new LinkReferenceElement(this);
- }
- return refElement;
- }
-
-}
-// PFLinkImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java
deleted file mode 100644
index 42fe7346f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl#getOutlinks <em>Outlinks</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl#getInlinks <em>Inlinks</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class PageflowNodeImpl extends PageflowElementImpl implements
- PageflowNode {
- /**
- * The cached value of the '{@link #getOutlinks() <em>Outlinks</em>}'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getOutlinks()
- * @generated
- * @ordered
- */
- protected EList outlinks = null;
-
- /**
- * The cached value of the '{@link #getInlinks() <em>Inlinks</em>}'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getInlinks()
- * @generated
- * @ordered
- */
- protected EList inlinks = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowNodeImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPageflowNode();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Pageflow getPageflow() {
- if (eContainerFeatureID != PageflowPackage.PAGEFLOW_NODE__PAGEFLOW)
- return null;
- return (Pageflow) eContainer;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setPageflow(Pageflow newPageflow) {
- if (newPageflow != eContainer
- || (eContainerFeatureID != PageflowPackage.PAGEFLOW_NODE__PAGEFLOW && newPageflow != null)) {
- if (EcoreUtil.isAncestor(this, newPageflow))
- throw new IllegalArgumentException(
- "Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newPageflow != null)
- msgs = ((InternalEObject) newPageflow).eInverseAdd(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.class, msgs);
- msgs = eBasicSetContainer((InternalEObject) newPageflow,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, newPageflow,
- newPageflow));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getOutlinks() {
- if (outlinks == null) {
- outlinks = new EObjectWithInverseResolvingEList(PageflowLink.class, this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowPackage.PF_LINK__SOURCE);
- }
- return outlinks;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getInlinks() {
- if (inlinks == null) {
- inlinks = new EObjectWithInverseResolvingEList(PageflowLink.class, this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowPackage.PF_LINK__TARGET);
- }
- return inlinks;
- }
-
- /**
- * @generated NOT
- */
- public PageflowLink findLinkTo(PageflowNode target) {
- //
- java.util.Iterator i = this.getOutlinks().iterator();
- while (i.hasNext()) {
- PageflowLink link = (PageflowLink) i.next();
- if (link.getTarget() == target)
- return link;
- }
- return null;
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, msgs);
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicAdd(otherEnd, msgs);
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return ((InternalEList) getInlinks()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return eBasicSetContainer(null,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, msgs);
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicRemove(otherEnd,
- msgs);
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return ((InternalEList) getInlinks()).basicRemove(otherEnd,
- msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return ((InternalEObject) eContainer).eInverseRemove(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return ((InternalEObject) eContainer).eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- return getName();
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- return getComment();
- case PageflowPackage.PAGEFLOW_NODE__X:
- return new Integer(getX());
- case PageflowPackage.PAGEFLOW_NODE__Y:
- return new Integer(getY());
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PAGEFLOW_NODE__ID:
- return getId();
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return getPageflow();
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return getOutlinks();
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return getInlinks();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- setPageflow((Pageflow) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- getOutlinks().clear();
- getOutlinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- getInlinks().clear();
- getInlinks().addAll((Collection) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- setPageflow((Pageflow) null);
- return;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- getOutlinks().clear();
- return;
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- getInlinks().clear();
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PAGEFLOW_NODE__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return getPageflow() != null;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return outlinks != null && !outlinks.isEmpty();
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return inlinks != null && !inlinks.isEmpty();
- }
- return super.eIsSet(eFeature);
- }
-
-}
-// PageflowNodeImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java
deleted file mode 100644
index 90b0866f1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java
+++ /dev/null
@@ -1,773 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class PageflowPackageImpl extends EPackageImpl implements
- PageflowPackage {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageflowEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageflowNodeEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pfLinkEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageflowElementEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pfPageEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pfLinkBendpointEClass = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
- * package package URI value.
- * <p>
- * Note: the correct way to create the package is via the static factory
- * method {@link #init init()}, which also performs initialization of the
- * package, or returns the registered package, if one already exists. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private PageflowPackageImpl() {
- super(eNS_URI, PageflowFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this model,
- * and for any others upon which it depends. Simple dependencies are
- * satisfied by calling this method on all dependent packages before doing
- * anything else. This method drives initialization for interdependent
- * packages directly, in parallel with this package, itself.
- * <p>
- * Of this package and its interdependencies, all packages which have not
- * yet been registered by their URI values are first created and registered.
- * The packages are then initialized in two steps: meta-model objects for
- * all of the packages are created before any are initialized, since one
- * package's meta-model objects may refer to those of another.
- * <p>
- * Invocation of this method will not affect any packages that have already
- * been initialized. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static PageflowPackage init() {
- if (isInited)
- return (PageflowPackage) EPackage.Registry.INSTANCE
- .get(PageflowPackage.eNS_URI);
-
- // Obtain or create and register package
- PageflowPackageImpl thePageflowPackage = (PageflowPackageImpl) (EPackage.Registry.INSTANCE
- .get(eNS_URI) instanceof PageflowPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new PageflowPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- thePageflowPackage.createPackageContents();
-
- // Initialize created meta-data
- thePageflowPackage.initializePackageContents();
-
- return thePageflowPackage;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPageflow() {
- return pageflowEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflow_Nodes() {
- return (EReference) pageflowEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflow_Links() {
- return (EReference) pageflowEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflow_Configfile() {
- return (EAttribute) pageflowEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPageflowNode() {
- return pageflowNodeEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflowNode_Pageflow() {
- return (EReference) pageflowNodeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflowNode_Outlinks() {
- return (EReference) pageflowNodeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflowNode_Inlinks() {
- return (EReference) pageflowNodeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPFLink() {
- return pfLinkEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_Pageflow() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_Target() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_Source() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Outcome() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Redirect() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_BendPoints() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Smallicon() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Largeicon() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Fromaction() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_ReferenceLink() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 7);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPageflowElement() {
- return pageflowElementEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Name() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Comment() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_X() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Y() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 3);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Width() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 4);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Height() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 5);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Id() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 6);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPFPage() {
- return pfPageEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFPage_Path() {
- return (EAttribute) pfPageEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFPage_Smallicon() {
- return (EAttribute) pfPageEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFPage_Largeicon() {
- return (EAttribute) pfPageEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPFLinkBendpoint() {
- return pfLinkBendpointEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D1Width() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D1Height() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D2Width() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D2Height() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 3);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_Weight() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 4);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLinkBendpoint_Link() {
- return (EReference) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 5);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowFactory getPageflowFactory() {
- return (PageflowFactory) getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is guarded to
- * have no affect on any invocation but its first. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void createPackageContents() {
- if (isCreated)
- return;
- isCreated = true;
-
- // Create classes and their features
- pageflowEClass = createEClass(PAGEFLOW);
- createEReference(pageflowEClass, PAGEFLOW__NODES);
- createEReference(pageflowEClass, PAGEFLOW__LINKS);
- createEAttribute(pageflowEClass, PAGEFLOW__CONFIGFILE);
-
- pageflowNodeEClass = createEClass(PAGEFLOW_NODE);
- createEReference(pageflowNodeEClass, PAGEFLOW_NODE__PAGEFLOW);
- createEReference(pageflowNodeEClass, PAGEFLOW_NODE__OUTLINKS);
- createEReference(pageflowNodeEClass, PAGEFLOW_NODE__INLINKS);
-
- pfLinkEClass = createEClass(PF_LINK);
- createEReference(pfLinkEClass, PF_LINK__PAGEFLOW);
- createEReference(pfLinkEClass, PF_LINK__TARGET);
- createEReference(pfLinkEClass, PF_LINK__SOURCE);
- createEAttribute(pfLinkEClass, PF_LINK__OUTCOME);
- createEAttribute(pfLinkEClass, PF_LINK__REDIRECT);
- createEReference(pfLinkEClass, PF_LINK__BEND_POINTS);
- createEAttribute(pfLinkEClass, PF_LINK__SMALLICON);
- createEAttribute(pfLinkEClass, PF_LINK__LARGEICON);
- createEAttribute(pfLinkEClass, PF_LINK__FROMACTION);
-
- pageflowElementEClass = createEClass(PAGEFLOW_ELEMENT);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__NAME);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__COMMENT);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__X);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__Y);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__WIDTH);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__HEIGHT);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__ID);
- createEAttribute(pageflowElementEClass,
- PAGEFLOW_ELEMENT__REFERENCE_LINK);
-
- pfPageEClass = createEClass(PF_PAGE);
- createEAttribute(pfPageEClass, PF_PAGE__PATH);
- createEAttribute(pfPageEClass, PF_PAGE__SMALLICON);
- createEAttribute(pfPageEClass, PF_PAGE__LARGEICON);
-
- pfLinkBendpointEClass = createEClass(PF_LINK_BENDPOINT);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D1_WIDTH);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D1_HEIGHT);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D2_WIDTH);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D2_HEIGHT);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__WEIGHT);
- createEReference(pfLinkBendpointEClass, PF_LINK_BENDPOINT__LINK);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized)
- return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Add supertypes to classes
- pageflowEClass.getESuperTypes().add(this.getPageflowElement());
- pageflowNodeEClass.getESuperTypes().add(this.getPageflowElement());
- pfLinkEClass.getESuperTypes().add(this.getPageflowElement());
- pfPageEClass.getESuperTypes().add(this.getPageflowNode());
-
- // Initialize classes and features; add operations and parameters
- initEClass(pageflowEClass, Pageflow.class, "Pageflow", !IS_ABSTRACT,
- !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPageflow_Nodes(), this.getPageflowNode(), this
- .getPageflowNode_Pageflow(), "nodes", null, 0, -1,
- Pageflow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPageflow_Links(), this.getPFLink(), this
- .getPFLink_Pageflow(), "links", null, 0, -1, Pageflow.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
- !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPageflow_Configfile(), ecorePackage.getEString(),
- "configfile", null, 0, 1, Pageflow.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pageflowNodeEClass, PageflowNode.class, "PageflowNode",
- IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPageflowNode_Pageflow(), this.getPageflow(), this
- .getPageflow_Nodes(), "pageflow", null, 1, 1,
- PageflowNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPageflowNode_Outlinks(), this.getPFLink(), this
- .getPFLink_Source(), "outlinks", null, 0, -1,
- PageflowNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPageflowNode_Inlinks(), this.getPFLink(), this
- .getPFLink_Target(), "inlinks", null, 0, -1,
- PageflowNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pfLinkEClass, PageflowLink.class, "PFLink", !IS_ABSTRACT,
- !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPFLink_Pageflow(), this.getPageflow(), this
- .getPageflow_Links(), "pageflow", null, 1, 1,
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLink_Target(), this.getPageflowNode(), this
- .getPageflowNode_Inlinks(), "target", null, 1, 1,
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLink_Source(), this.getPageflowNode(), this
- .getPageflowNode_Outlinks(), "source", null, 1, 1,
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Outcome(), ecorePackage.getEString(),
- "outcome", null, 0, 1, PageflowLink.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Redirect(), ecorePackage.getEBoolean(),
- "redirect", null, 0, 1, PageflowLink.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLink_BendPoints(), this.getPFLinkBendpoint(), this
- .getPFLinkBendpoint_Link(), "bendPoints", null, 0, -1,
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Smallicon(), ecorePackage.getEString(),
- "smallicon", null, 0, 1, PageflowLink.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Largeicon(), ecorePackage.getEString(),
- "largeicon", null, 0, 1, PageflowLink.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Fromaction(), ecorePackage.getEString(),
- "fromaction", null, 0, 1, PageflowLink.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pageflowElementEClass, PageflowElement.class,
- "PageflowElement", IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPageflowElement_Name(), ecorePackage.getEString(),
- "name", "unnamed", 0, 1, PageflowElement.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_Comment(), ecorePackage.getEString(),
- "comment", null, 0, 1, PageflowElement.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_X(), ecorePackage.getEInt(), "x",
- "0", 0, 1, PageflowElement.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPageflowElement_Y(), ecorePackage.getEInt(), "y",
- "0", 0, 1, PageflowElement.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPageflowElement_Width(), ecorePackage.getEInt(),
- "width", "-1", 0, 1, PageflowElement.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_Height(), ecorePackage.getEInt(),
- "height", "-1", 0, 1, PageflowElement.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_Id(), ecorePackage.getEString(),
- "id", null, 1, 1, PageflowElement.class, !IS_TRANSIENT,
- IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_ReferenceLink(), ecorePackage
- .getEString(), "referenceLink", "", 0, 1,
- PageflowElement.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
-
- initEClass(pfPageEClass, PageflowPage.class, "PFPage", !IS_ABSTRACT,
- !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPFPage_Path(), ecorePackage.getEString(), "path",
- null, 0, 1, PageflowPage.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPFPage_Smallicon(), ecorePackage.getEString(),
- "smallicon", null, 0, 1, PageflowPage.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFPage_Largeicon(), ecorePackage.getEString(),
- "largeicon", null, 0, 1, PageflowPage.class, !IS_TRANSIENT,
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pfLinkBendpointEClass, PageflowLinkBendpoint.class,
- "PFLinkBendpoint", !IS_ABSTRACT, !IS_INTERFACE,
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPFLinkBendpoint_D1Width(), ecorePackage.getEInt(),
- "d1Width", null, 0, 1, PageflowLinkBendpoint.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_D1Height(), ecorePackage.getEInt(),
- "d1Height", null, 0, 1, PageflowLinkBendpoint.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_D2Width(), ecorePackage.getEInt(),
- "d2Width", null, 0, 1, PageflowLinkBendpoint.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_D2Height(), ecorePackage.getEInt(),
- "d2Height", null, 0, 1, PageflowLinkBendpoint.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_Weight(), ecorePackage.getEFloat(),
- "weight", "0.5", 0, 1, PageflowLinkBendpoint.class,
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLinkBendpoint_Link(), this.getPFLink(), this
- .getPFLink_BendPoints(), "link", null, 1, 1,
- PageflowLinkBendpoint.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-}
-// PageflowPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java
deleted file mode 100644
index 105382c41..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>PF Page</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl#getPath <em>Path</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl#getLargeicon <em>Largeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PageflowPageImpl extends PageflowNodeImpl implements PageflowPage {
- private String path;
-
- private String smallIcon;
-
- private String largeIcon;
-
- /**
- * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getPath()
- * @generated
- * @ordered
- */
- protected static final String PATH_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getSmallicon() <em>Smallicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getSmallicon()
- * @generated
- * @ordered
- */
- protected static final String SMALLICON_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getLargeicon() <em>Largeicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLargeicon()
- * @generated
- * @ordered
- */
- protected static final String LARGEICON_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowPageImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPFPage();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getPath() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__PATH);
- // Try to return reasonable result.
- return result == null && getFCElements().isEmpty() ? path
- : (result != null ? result : PATH_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setPath(String newValue) {
- String oldPath = getPath();
- path = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__PATH, oldPath, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public void setComment(String newValue) {
- super.setComment(newValue);
- String oldComment = getComment();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__COMMENT, oldComment,
- newValue));
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public String getComment() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__COMMENT);
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? super.getComment()
- : (result != null ? result
- : PageflowElementImpl.COMMENT_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public String getName() {
- String result;
- // To see if it is in navigation rule.
- result = (String) getFCElements().get(PageflowPackage.PF_PAGE__NAME);
- if (result == null) {
- if (super.getName() == null || super.getName().trim().length() == 0) {
- result = getPath();
- } else {
- result = super.getName();
- }
- }
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? PageflowElementImpl.NAME_EDEFAULT
- : (result == null ? null : result);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public void setName(String newName) {
- super.setName(newName);
- String oldName = getName();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__NAME, oldName, newName));
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getSmallicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__SMALLICON);
-
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? smallIcon : (result != null ? result
- : SMALLICON_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setSmallicon(String newValue) {
- String oldSmallicon = getSmallicon();
- smallIcon = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__SMALLICON, oldSmallicon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getLargeicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__LARGEICON);
-
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? largeIcon : (result != null ? result
- : LARGEICON_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setLargeicon(String newValue) {
- String oldLargeIcon = getLargeicon();
- largeIcon = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__LARGEICON, oldLargeIcon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PF_PAGE__PAGEFLOW, msgs);
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicAdd(otherEnd, msgs);
- case PageflowPackage.PF_PAGE__INLINKS:
- return ((InternalEList) getInlinks()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return eBasicSetContainer(null,
- PageflowPackage.PF_PAGE__PAGEFLOW, msgs);
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicRemove(otherEnd,
- msgs);
- case PageflowPackage.PF_PAGE__INLINKS:
- return ((InternalEList) getInlinks()).basicRemove(otherEnd,
- msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return ((InternalEObject) eContainer).eInverseRemove(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return ((InternalEObject) eContainer).eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- return getName();
- case PageflowPackage.PF_PAGE__COMMENT:
- return getComment();
- case PageflowPackage.PF_PAGE__X:
- return new Integer(getX());
- case PageflowPackage.PF_PAGE__Y:
- return new Integer(getY());
- case PageflowPackage.PF_PAGE__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PF_PAGE__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PF_PAGE__ID:
- return getId();
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return getPageflow();
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return getOutlinks();
- case PageflowPackage.PF_PAGE__INLINKS:
- return getInlinks();
- case PageflowPackage.PF_PAGE__PATH:
- return getPath();
- case PageflowPackage.PF_PAGE__SMALLICON:
- return getSmallicon();
- case PageflowPackage.PF_PAGE__LARGEICON:
- return getLargeicon();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- setPageflow((Pageflow) newValue);
- return;
- case PageflowPackage.PF_PAGE__OUTLINKS:
- getOutlinks().clear();
- getOutlinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PF_PAGE__INLINKS:
- getInlinks().clear();
- getInlinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PF_PAGE__PATH:
- setPath((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__SMALLICON:
- setSmallicon((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__LARGEICON:
- setLargeicon((String) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- setPageflow((Pageflow) null);
- return;
- case PageflowPackage.PF_PAGE__OUTLINKS:
- getOutlinks().clear();
- return;
- case PageflowPackage.PF_PAGE__INLINKS:
- getInlinks().clear();
- return;
- case PageflowPackage.PF_PAGE__PATH:
- setPath(PATH_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__SMALLICON:
- setSmallicon(SMALLICON_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__LARGEICON:
- setLargeicon(LARGEICON_EDEFAULT);
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PF_PAGE__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PF_PAGE__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PF_PAGE__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PF_PAGE__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PF_PAGE__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PF_PAGE__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return getPageflow() != null;
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return outlinks != null && !outlinks.isEmpty();
- case PageflowPackage.PF_PAGE__INLINKS:
- return inlinks != null && !inlinks.isEmpty();
- case PageflowPackage.PF_PAGE__PATH:
- return PATH_EDEFAULT == null ? getPath() != null : !PATH_EDEFAULT
- .equals(getPath());
- case PageflowPackage.PF_PAGE__SMALLICON:
- return SMALLICON_EDEFAULT == null ? getSmallicon() != null
- : !SMALLICON_EDEFAULT.equals(getSmallicon());
- case PageflowPackage.PF_PAGE__LARGEICON:
- return LARGEICON_EDEFAULT == null ? getLargeicon() != null
- : !LARGEICON_EDEFAULT.equals(getLargeicon());
- }
- return super.eIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (path: ");
- result.append(getPath());
- result.append(", smallicon: ");
- result.append(getSmallicon());
- result.append(", largeicon: ");
- result.append(getLargeicon());
- result.append(')');
- return result.toString();
- }
-
- public ReferenceElement getFCElements() {
-
- if (refElement == null) {
- refElement = new PageReferenceElement(this);
- }
- return refElement;
- }
-
-}
-// PFPageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java
deleted file mode 100644
index aee560b6d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-
-/**
- * The base class for mapping facesconfig node from pageflow node. The
- * ReferenceElement could be extended later to enable other model to be
- * referenced by pageflow.
- *
- * @author hmeng
- *
- */
-public abstract class ReferenceElement {
-
- private List data = new ArrayList();
-
- protected PageflowElement pageflowElement;
-
- public ReferenceElement(PageflowElement pageflowElement) {
- this.pageflowElement = pageflowElement;
- }
-
- public ReferenceElement(PageflowElement pageflowElement,
- EObject facesConfigObject) {
- this(pageflowElement);
- this.add(facesConfigObject);
- }
-
- /**
- * Add object to the list.
- *
- * @param object
- */
- public void add(EObject object) {
- if (!data.contains(object)) {
- data.add(object);
- }
- }
-
- public boolean contains(EObject object) {
- return data.contains(object);
- }
-
- /**
- * The fragment path of a node.
- *
- * @param object
- * @return
- */
- public static String resolvePath(EObject object) {
- if (object != null) {
- ((CompatibilityXMIResource) object.eResource())
- .setFormat(CompatibilityXMIResource.FORMAT_EMF1);
- String uriTarget = object.eResource().getURIFragment(object);
- return uriTarget;
- } else {
- return "";
- }
- }
-
- public boolean remove(EObject object) {
- boolean result = data.remove(object);
- return result;
- }
-
- /**
- * Resolve each referenced data's path and combine the result into one
- * string, the path will be seperated with '|'.
- *
- * @return
- */
- public String resolveReferenceString() {
- String result = "";
- for (int i = 0, n = data.size(); i < n; i++) {
- result += resolvePath((EObject) data.get(i)) + "|";
- }
- if (result.length() > 0) {
- result = result.substring(0, result.length());
- }
- return result;
- }
-
- /**
- * The EMF paths of all referenced elements.
- *
- * @return
- */
- public List getPaths() {
- List paths = new ArrayList();
- for (int i = 0, n = data.size(); i < n; i++) {
- paths.add(resolvePath((EObject) data.get(i)));
- }
- return paths;
- }
-
- /**
- * The facesconfig elements that are referenced.
- *
- * @return
- */
- public List getData() {
- return data;
- }
-
- public void clear() {
- if (!data.isEmpty()) {
- data.clear();
- }
- }
-
- public boolean isEmpty() {
- return data.isEmpty();
- }
-
- public void dispose() {
- clear();
- }
-
- /**
- * Update the referenced faces-config elements.
- *
- */
- abstract public void update();
-
- /**
- * Return a pageflow property's value with referenced faces-config element.
- *
- * @param eFeature
- * @return
- */
- abstract public Object get(int eFeature);
-
- /**
- * To set a pageflow property's value will result in seting a faces-config
- * element.
- *
- * @param eFeature
- * @param newValue
- */
- abstract public void set(EStructuralFeature eFeature, Object newValue);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java
deleted file mode 100644
index 4b8ec9b92..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- *
- * Dialog Cell Editor for Action browser.
- *
- * @author Xiao-guang Zhang
- */
-public class ActionDialogCellEditor extends EditableDialogCellEditor {
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor()
- */
- public ActionDialogCellEditor() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor(Composite parent)
- */
- public ActionDialogCellEditor(Composite parent) {
- super(parent);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor(Composite parent, int style)
- */
- public ActionDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(org.eclipse.swt.widgets.Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String actionExpression = getDefaultText().getText();
- // IStructuredSelection selectionToPass = StructuredSelection.EMPTY;
- // Create a new jsf Wizard
-
- // FIXME sfshi 2005-11-16
- // ActionSelectionWizard actionSelectionWizard =
- // new ActionSelectionWizard(ActionSelectionWizard.CONSIDER_METHODS);
- // actionSelectionWizard.init(EditorPlugin.getDefault().getWorkbench(),
- // selectionToPass);
- // actionSelectionWizard.setActionExpression(actionExpression);
- // //using a wizard dialog to display the new jsf wizard
- // WizardDialog actionSelectionWizardDialog =
- // new WizardDialog(cellEditorWindow.getShell(),actionSelectionWizard);
- // if (actionSelectionWizardDialog.open() == WizardDialog.OK )
- // {
- // actionExpression = actionSelectionWizard.getActionExpression();
- // }
- return actionExpression;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java
deleted file mode 100644
index 924ebd1aa..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- *
- * Dialog Cell Editor for Action's outcome browser.
- *
- * @author Xiao-guang Zhang
- */
-public class ActionOutcomeDialogCellEditor extends EditableDialogCellEditor {
- /** the source PFLink element */
- PageflowElement element;
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor()
- */
- public ActionOutcomeDialogCellEditor(PageflowElement element) {
- super();
- this.element = element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor(Composite parent)
- */
- public ActionOutcomeDialogCellEditor(Composite parent,
- PageflowElement element) {
- super(parent);
- this.element = element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor(Composite parent, int style)
- */
- public ActionOutcomeDialogCellEditor(Composite parent, int style,
- PageflowElement element) {
- super(parent, style);
- this.element = element;
- }
-
- /**
- * get the previous JSP page, it can be null if the previous node is not
- * PFPage, but PFAction.
- *
- * @param element
- * @return
- */
- private String getPreviousJSPPath(PageflowElement element) {
- String jspPath = null;
- if (element instanceof PageflowLink) {
- PageflowNode source = ((PageflowLink) element).getSource();
-
- if (source instanceof PageflowPage) {
- jspPath = ((PageflowPage) source).getPath();
- }
- }
- return jspPath;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(org.eclipse.swt.widgets.Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String outcome = getDefaultText().getText();
-
- String jspPathName = WebrootUtil.getProjectPath(element,
- getPreviousJSPPath(element));
-
- ActionOutcomeSelectionDialog selectionDialog = new ActionOutcomeSelectionDialog(
- getControl().getShell(), outcome, jspPathName);
-
- if (selectionDialog.open() == Window.OK) {
- outcome = selectionDialog.getSelectedAction();
- }
-
- return outcome;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
deleted file mode 100644
index 90e70c88d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.Separator;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.JSPUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/**
- * This dialog is used to edit outcome property of link component of Pageflow
- * Designer.
- *
- * @author Xiao-guang Zhang
- */
-public class ActionOutcomeSelectionDialog extends Dialog {
-
- /** property's name text control */
- private Text actionText;
-
- /** linked source jsp file name */
- private String jspName;
-
- /** the current outcome */
- private String outcome;
-
- /** action table control */
- private Table actionTable;
-
- /** Column width of component name and action */
- private static final int COMPONENT_COL_WIDTH = 160;
-
- private static final int ACTION_COL_WIDTH = 160;
-
- /** Dialog default height and width */
- private static final int DIALOG_DEFAULT_WIDTH = 400;
-
- private static final int DIALOG_DEFAULT_HEIGHT = 300;
-
- public static String JSF_EL_LEFT_BRACE = "#{";
-
- public static String JSF_EL_RIGHT_BRACE = "}";
-
- /** the listener for the text modification */
- private ModifyListener modifyListener;
-
- public ActionOutcomeSelectionDialog(Shell parentShell, String outcome,
- String jspName) {
- super(parentShell);
- this.outcome = outcome;
- this.jspName = jspName;
-
- modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- verifyComplete();
- }
- };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createDialogArea(Composite)
- */
- protected Control createDialogArea(Composite parent) {
- GridLayout gridLayout;
-
- Composite container = (Composite) super.createDialogArea(parent);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- gridLayout.marginWidth = 10;
- gridLayout.marginHeight = 10;
- container.setLayout(gridLayout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- // gd.widthHint = 300;
- gd.heightHint = DIALOG_DEFAULT_HEIGHT;
- gd.widthHint = DIALOG_DEFAULT_WIDTH;
- container.setLayoutData(gd);
-
- Label choiceLabel = new Label(container, SWT.LEFT);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- // gd.widthHint = 100;
- choiceLabel.setLayoutData(gd);
- // Pageflow.Property.Action.OutcomeSelectionDialog.Choice = Enter the
- // outcome or select one from action list below:
- choiceLabel
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_Choice);
-
- createOutcomeSection(container);
-
- createActionListSection(container);
-
- return container;
- }
-
- /**
- * create a Outcome input section
- *
- * @param container
- */
- protected void createOutcomeSection(Composite container) {
- Composite outcomeSection = new Composite(container, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginWidth = 0;
- outcomeSection.setLayout(gl);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- outcomeSection.setLayoutData(gd);
-
- actionText = new Text(outcomeSection, SWT.BORDER);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.FILL_HORIZONTAL);
- actionText.setLayoutData(gd);
-
- actionText.addModifyListener(modifyListener);
-
- if (outcome != null && outcome.length() > 0) {
- actionText.setText(outcome);
- }
- }
-
- /**
- * create action list table section
- *
- * @param container
- */
- protected void createActionListSection(Composite container) {
- final Group actionSection = new Group(container, SWT.NONE);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- actionSection.setLayout(gridLayout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- actionSection.setLayoutData(gd);
-
- String actionListTitle = PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Title;//$NON-NLS-1$
-
- if (jspName != null && jspName.length() > 0) {
- actionListTitle += " in " + jspName;
- }
- // Pageflow.Property.Action.OutcomeSelectionDialog.ActionListTable.Title
- // = Actions
- actionSection.setText(actionListTitle);
-
- actionTable = new Table(actionSection, SWT.BORDER | SWT.FULL_SELECTION);
- actionTable.setLayoutData(new GridData(GridData.FILL_BOTH));
- actionTable.setHeaderVisible(true);
- actionTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- actionTable.setLayout(layout);
-
- layout.addColumnData(new ColumnPixelData(COMPONENT_COL_WIDTH));
- layout.addColumnData(new ColumnPixelData(ACTION_COL_WIDTH));
- TableColumn componentCol = new TableColumn(actionTable, SWT.NONE);
- // Pageflow.Property.Action.OutcomeSelectionDialog.ActionListTable.Component
- // = Component ID
- componentCol
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Component); //$NON-NLS-1$
- TableColumn actionCol = new TableColumn(actionTable, SWT.NONE);
-
- // Pageflow.Property.Action.OutcomeSelectionDialog.ActionListTable.Action
- // = Action
- actionCol
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action);//$NON-NLS-1$
-
- actionTable.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- TableItem selItem = (TableItem) e.item;
- String action = selItem.getText(1);
- if (action != null && action.length() > 0) {
- actionText.setText(action);
- }
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- });
-
- addActionsInJSP();
-
- }
-
- /**
- * Creates a separator line. Expects a <code>GridLayout</code> with at
- * least 1 column.
- *
- * @param composite
- * the parent composite
- * @param nColumns
- * number of columns to span
- */
- protected void createSeparator(Composite composite, int nColumns) {
- (new Separator(SWT.SEPARATOR | SWT.HORIZONTAL)).doFillIntoGrid(null,
- composite, nColumns, convertHeightInCharsToPixels(1));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createButtonsForButtonBar(Composite)
- */
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
-
- verifyComplete();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#configureShell(Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
-
- // Pageflow.Property.Action.OutcomeSelectionDialog.Title = Outcome
- // Selection
- newShell
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_Title); //$NON-NLS-1$
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#buttonPressed(int)
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == IDialogConstants.CANCEL_ID) {
- setReturnCode(CANCEL);
- close();
- return;
- } else if (buttonId == IDialogConstants.OK_ID) {
- setReturnCode(OK);
-
- outcome = actionText.getText();
-
- close();
- return;
- }
- super.buttonPressed(buttonId);
- }
-
- /**
- *
- * check the dialog inputs are complete or not, and set the OK button enable
- * or not.
- */
- private void verifyComplete() {
- if (getButton(IDialogConstants.OK_ID) != null) {
- getButton(IDialogConstants.OK_ID).setEnabled(isDialogComplete());
- }
- }
-
- /**
- * check the dialog inputs are complete or not.
- *
- * @return
- */
- private boolean isDialogComplete() {
- return isValidName();
- }
-
- /**
- * the input name is valid or not
- *
- * @return
- */
- private boolean isValidName() {
- return (actionText.getText().length() > 0);
- }
-
- /**
- * get the selected action in the action table
- *
- * @return - selected action
- */
- public String getSelectedAction() {
- return outcome;
- }
-
- /**
- * add actions in the source jsp file to the action list table control
- *
- */
- private void addActionsInJSP() {
- List actionNodes = JSPUtil.getActionListInJSPFile(jspName);
-
- if (actionNodes != null) {
- for (int i = 0; i < actionNodes.size(); i++) {
- Element node = (Element) actionNodes.get(i);
-
- String tagName = node.getTagName();
- Attr idAttr = node.getAttributeNode("id");
- String id = "";
- if (idAttr != null) {
- id = idAttr.getNodeValue(); //$NON-NLS-1$
- }
-
- String componentName = id + "(" + tagName + ")"; //$NON-NLS-1$
- Attr actionAttr = node.getAttributeNode("action");
- String action = "";
- if (actionAttr != null) {
- action = actionAttr.getValue();
- if (!isValidEL(action)) {
- addActionTableItem(componentName, action);
- }
- }
- }
- }
- }
-
- public static boolean isValidEL(String expressionString) {
- if (expressionString == null || expressionString.length() == 0) {
- return true;
- }
-
- return expressionString.startsWith(JSF_EL_LEFT_BRACE)
- && expressionString.endsWith(JSF_EL_RIGHT_BRACE);
- }
-
- /**
- * add a new action item in the previous jsp page.
- *
- * @param componentName -
- * JSF component element
- * @param action -
- * value of action's attribute
- */
- private void addActionTableItem(String componentName, String action) {
- if (componentName != null && componentName.length() > 0
- && action != null && action.length() > 0) {
- TableItem item = new TableItem(actionTable, SWT.NONE);
- item.setText(0, componentName);
- item.setText(1, action);
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java
deleted file mode 100644
index 283d7b550..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java
deleted file mode 100644
index 98e570797..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Hong-tao Meng
- */
-public abstract class EditableDialogCellEditor extends DialogCellEditor {
- private Text text;
-
- /**
- *
- */
- public EditableDialogCellEditor() {
- super();
- }
-
- /**
- * @param parent
- */
- public EditableDialogCellEditor(Composite parent) {
- super(parent);
- }
-
- /**
- * @param parent
- * @param style
- */
- public EditableDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.DialogCellEditor#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite cell) {
- text = new Text(cell, SWT.LEFT);
- text.setFont(cell.getFont());
- text.setBackground(cell.getBackground());
- text.addKeyListener(new KeyAdapter() {
- // hook key pressed - see PR 14201
- public void keyPressed(KeyEvent e) {
- keyReleaseOccured(e);
- // disposed this cell editor
- if ((getControl() == null) || getControl().isDisposed()) {
- return;
- }
- }
- });
- // when the text control has focus, the cellEditor will deactive even
- // when you press the button.
- // Add the follow codes enable switch to the button control.
- text.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- boolean newValidState = isCorrect(text.getText());
- if (newValidState) {
- markDirty();
- doSetValue(text.getText());
- } else {
- // try to insert the current value into the error message.
- setErrorMessage(MessageFormat.format(getErrorMessage(),
- new Object[] { text.getText().toString() }));
- }
- }
- });
-
- return text;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#doSetFocus()
- */
- protected void doSetFocus() {
- text.setFocus();
- text.selectAll();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.DialogCellEditor#updateContents(java.lang.Object)
- */
- protected void updateContents(Object value) {
- if (text == null) {
- return;
- }
-
- String text = "";//$NON-NLS-1$
- if (value != null) {
- text = value.toString();
- }
- this.text.setText(text);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#keyReleaseOccured(org.eclipse.swt.events.KeyEvent)
- */
- protected void keyReleaseOccured(KeyEvent keyEvent) {
- if (keyEvent.character == '\r') {
- boolean newValidState = isCorrect(text.getText());
- if (newValidState) {
- markDirty();
- doSetValue(text.getText());
- } else {
- // try to insert the current value into the error message.
- setErrorMessage(MessageFormat.format(getErrorMessage(),
- new Object[] { text.getText().toString() }));
- }
- fireApplyEditorValue();
- }
- super.keyReleaseOccured(keyEvent);
- }
-
- public Text getDefaultText() {
- return text;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java
deleted file mode 100644
index e6008ee83..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section.EditorSection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-
-/**
- * @author jchoi
- */
-public class EditorSectionDescriptor implements ISectionDescriptor {
- /**
- * constructor
- */
- public EditorSectionDescriptor() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.EDITOR_SECTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
- */
- public ITypeMapper getFilter() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new EditorSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.ATTRIBUTE_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- // The editor section in the attribute tab will be shown for only
- // pageflow element
- if (object instanceof PageflowEditPart) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ITabbedPropertiesConstants.TOP_SECTION;
- }
-
- public int getEnablesFor() {
- // TODO Auto-generated method stub
- return ENABLES_FOR_ANY;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java
deleted file mode 100644
index 9e10aa704..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.ListChoiceDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * The cell editor used to locate an existing pageflow page node in current
- * pageflow.
- *
- * @author hmeng
- *
- */
-public class ExistingPagePathDialogCellEditor extends EditableDialogCellEditor {
- Pageflow pageflow;
-
- public ExistingPagePathDialogCellEditor() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public ExistingPagePathDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- // TODO Auto-generated constructor stub
- }
-
- public ExistingPagePathDialogCellEditor(Composite parent, Pageflow pageflow) {
- super(parent);
- this.pageflow = pageflow;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String jsfSelection = "";
- if (getDefaultText() != null && getDefaultText().getText().length() > 0) {
- jsfSelection = getDefaultText().getText();
- }
- ListChoiceDialog dialog = new ListChoiceDialog(cellEditorWindow
- .getShell(), getPagePaths(),
- PageflowMessages.ExistingPagePathDialogCellEdito_LabelText);
-
- if (dialog.open() == Window.OK) {
- jsfSelection = dialog.getResult();
- }
- return jsfSelection;
- }
-
- /**
- * Collect page paths in current pageflow.
- *
- * @return
- */
- private String[] getPagePaths() {
- List result = new ArrayList();
- List list = pageflow.getNodes();
- for (int i = 0; i < list.size(); i++) {
- String path = ((PageflowPage) list.get(i)).getPath();
- if (path != null && path.trim().length() > 0) {
- result.add(path);
- }
- }
- String[] r = (String[]) result.toArray(new String[result.size()]);
- Arrays.sort(r);
- return r;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java
deleted file mode 100644
index 86e661454..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertyConstants;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-/**
- * This class defines the general tab for pageflow attributes. This class
- * defines the controls shown in this sectin and their event handler. For
- * MultiPageEditorPart, if it support getAdapter(IEditorPart.class) to get the
- * current active editor, then, this section can get the different
- * PropertySheetPage for different sub EditorPart.
- *
- * @author Xiao-guang Zhang
- */
-public class GeneralViewSection implements ISection, SelectionListener,
- ISelectionChangedListener {
- /** the pagebook */
- private PageBook pageBook = null;
-
- /**
- * A data structure used to store the information about a single page within
- * a MultiPageEditorPart
- */
- protected static class PageRec {
-
- /**
- * The part including editorpart, or Control
- */
- public IWorkbenchPart part;
-
- /**
- * The page.
- */
- public IPropertySheetPage page;
-
- /**
- * Creates a new page record initialized to the given part and page.
- *
- * @param part
- * @param page
- */
- public PageRec(IWorkbenchPart part, IPropertySheetPage page) {
- this.part = part;
- this.page = page;
- }
-
- /**
- * Disposes of this page record by <code>null</code>ing its fields.
- */
- public void dispose() {
- part = null;
- page = null;
- }
- }
-
- /**
- * Map from parts to part records (key type: <code>IWorkbenchPart</code>;
- * value type: <code>PartRec</code>).
- */
- private Map mapPartToRec = new HashMap();
-
- /**
- * The page record for the default page.
- */
- private PageRec defaultPageRec;
-
- /**
- * The page rec which provided the current page or <code>null</code>
- */
- private PageRec activeRec;
-
- /*
- * (non-Javadoc)
- *
- * @see com.createControls(Composite, TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage tabbedPropertySheetPage) {
- FillLayout layout = new FillLayout();
- layout.marginWidth = ITabbedPropertyConstants.HSPACE;
- layout.marginHeight = ITabbedPropertyConstants.VSPACE;
-
- // composite.setLayout(layout);
- parent.setLayout(layout);
- // pagebook
- pageBook = new PageBook(parent, SWT.BORDER);
-
- // create a default property page.
- createDefaultPage();
-
- // Show the default page
- if (defaultPageRec != null) {
- showPageRec(defaultPageRec);
- }
- }
-
- /**
- * Shows page contained in the given page record in this view. The page
- * record must be one from this pagebook view.
- * <p>
- * The <code>PageBookView</code> implementation of this method asks the
- * pagebook control to show the given page's control, and records that the
- * given page is now current. Subclasses may extend.
- * </p>
- *
- * @param pageRec
- * the page record containing the page to show
- */
- protected void showPageRec(PageRec pageRec) {
- // If already showing do nothing
- if (activeRec == pageRec) {
- return;
- }
- // If the page is the same, just set activeRec to pageRec
- if (activeRec != null && pageRec != null
- && activeRec.page == pageRec.page) {
- activeRec = pageRec;
- return;
- }
-
- // Show new page.
- activeRec = pageRec;
- Control pageControl = activeRec.page.getControl();
- if (pageControl != null && !pageControl.isDisposed()) {
- // Verify that the page control is not disposed
- // If we are closing, it may have already been disposed
- pageBook.showPage(pageControl);
- }
- }
-
- /**
- * Creates a page for a given part. Adds it to the pagebook but does not
- * show it.
- *
- * @param part
- * The part we are making a page for.
- * @return IWorkbenchPart
- */
- private PageRec createPage(IWorkbenchPart part) {
- PageRec rec = doCreatePage(part);
- if (rec != null) {
- mapPartToRec.put(part, rec);
- }
- return rec;
- }
-
- /*
- * (non-Javadoc) Method declared on PageBookView.
- */
- protected PageRec doCreatePage(IWorkbenchPart part) {
- // FIXME: Because the PropertySheetPage of StructuredTextEditor has a
- // bug:
- // the editor can't be opened twice if the property view is shown.
- // This bug only exists in WTP 1.0.0 version.
- if (part instanceof StructuredTextEditor) {
- return null;
- }
- // Try to get an property page.
- Object obj = part.getAdapter(IPropertySheetPage.class);
- if (obj instanceof IPropertySheetPage) {
- IPropertySheetPage page = (IPropertySheetPage) obj;
-
- page.createControl(getPageBook());
-
- return new PageRec(part, page);
- }
- // There is no content property page
- return null;
- }
-
- private void createDefaultPage() {
- // Create the default PropertySheetPage rec.
- IPropertySheetPage defaultPage = new PropertySheetPage();
- defaultPage.createControl(getPageBook());
-
- defaultPageRec = new PageRec(null, defaultPage);
- }
-
- /**
- * Returns the pagebook control for this view.
- *
- * @return the pagebook control, or <code>null</code> if not initialized
- */
- protected PageBook getPageBook() {
- return pageBook;
- }
-
- /**
- * Returns the page record for the given part.
- *
- * @param part
- * the part
- * @return the corresponding page record, or <code>null</code> if not
- * found
- */
- protected PageRec getPageRec(Object part) {
- return (PageRec) mapPartToRec.get(part);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#setInput(IWorkbenchPart, ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- if (part instanceof MultiPageEditorPart) {
- IEditorPart subPage = (IEditorPart) part
- .getAdapter(IEditorPart.class);
- if (subPage != null) {
- // get or Create a PropertySheetPage for the part.
- PageRec rec = getPageRec(subPage);
- if (rec == null) {
- rec = createPage(subPage);
- }
-
- // Show the page.
- if (rec != null) {
- showPageRec(rec);
- } else {
- showPageRec(defaultPageRec);
- }
- }
- }
- activeRec.page.selectionChanged(part, selection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#aboutToBeShown()
- */
- public void aboutToBeShown() {
- refresh();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#aboutToBeHidden()
- */
- public void aboutToBeHidden() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#dispose()
- */
- public void dispose() {
- // Deref all of the pages.
- activeRec = null;
- if (defaultPageRec != null) {
- // check for null since the default page may not have
- // been created (ex. perspective never visible)
- defaultPageRec.page.dispose();
- defaultPageRec = null;
- }
- Map clone = (Map) ((HashMap) mapPartToRec).clone();
- Iterator iter = clone.values().iterator();
- while (iter.hasNext()) {
- PageRec rec = (PageRec) iter.next();
- removePage(rec);
- }
- }
-
- /**
- * Removes a page record. If it is the last reference to the page dispose of
- * it - otherwise just decrement the reference count.
- *
- * @param rec
- */
- private void removePage(PageRec rec) {
- mapPartToRec.remove(rec.part);
-
- Control control = rec.page.getControl();
- if (control != null && !control.isDisposed()) {
- // Dispose the page's control so pages don't have to do this in
- // their
- // dispose method.
- // The page's control is a child of this view's control so if this
- // view
- // is closed, the page's control will already be disposed.
- control.dispose();
- }
-
- // free the page
- doDestroyPage(rec.part, rec);
- }
-
- /**
- * Destroys a page in the pagebook for a particular part.
- *
- * @param part
- * the input part
- * @param pageRecord
- * a page record for the part
- */
- protected void doDestroyPage(IWorkbenchPart part, PageRec rec) {
- IPropertySheetPage page = (IPropertySheetPage) rec.page;
- page.dispose();
- rec.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#getMinimumHeight()
- */
- public int getMinimumHeight() {
- return SWT.DEFAULT;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.xtools.common.ui.properties.ISection#shouldUseExtraSpace()
- */
- public boolean shouldUseExtraSpace() {
- /**
- * here should return true, otherwise, the component controls will not
- * fill the whole panel of the tab.
- */
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.xtools.common.ui.properties.ISection#refresh()
- */
- public void refresh() {
- return;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- setInput((IWorkbenchPart) event.getSource(), event.getSelection());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java
deleted file mode 100644
index b6c625256..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementTreeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-
-/**
- * This class defines the section descriptor for pageflow attributes. Following
- * is the typical function of SectionDescriptor for tabbed property views. 1. In
- * tabbed property view, there are multiple sections, one or more than one
- * sections can be composed of one tab. 2. Each of section has an ID, and their
- * relationship is defined by the function "getAfterSection". 3. Not all
- * sections are enabled always. They are enabled according to current
- * WorkbenchPart and selection, which is defined in function "appliesTo".
- *
- * @author Xiao-guang Zhang
- */
-public class GeneralViewSectionDescriptor implements ISectionDescriptor {
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.GENERAL_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getFilter()
- */
- public ITypeMapper getFilter() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new GeneralViewSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.xtools.common.ui.properties.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.GENERAL_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#appliesTo(IWorkbenchPart, ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- // FIXME: Should move the appliesTo to differnt page of
- // MultiPageEditorPart.
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- // The general tab will be shown for only pageflow element and
- // pageflow link editparts
- if (object instanceof PageflowElementEditPart
- || object instanceof PageflowElementTreeEditPart) {
- return true;
- } else if (object instanceof PageflowLinkEditPart) {
- PageflowLink pfLink = (PageflowLink) ((PageflowLinkEditPart) object).getModel();
- if (PageflowValidation.getInstance().isValidLinkForProperty(
- pfLink)) {
- return true;
- }
- } else {
- return true;
- }
- } else if (selection instanceof TextSelection) {
- return true;
- }
-
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return "";
- }
-
- public int getEnablesFor() {
- // TODO Auto-generated method stub
- return ENABLES_FOR_ANY;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java
deleted file mode 100644
index a365f8655..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-/**
- * @author jchoi
- * @version
- */
-public interface ITabbedPropertiesConstants {
- public static int BROWSE_HEIGHT = 18;
-
- public static int BROWSE_WIDTH = 20;
-
- public static final String GENERAL_TAB_ID = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.general";
-
- public static final String ATTRIBUTE_TAB_ID = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.attribute";
-
- public static final String OPTIONAL_SECTION = "attribute.optional"; // 5
-
- public static final String COMMON_SECTION = "attribute.optional"; // 5
-
- public static final String LINK_SECTION = "attribute.link"; // 4
-
- public static final String PAGE_SECTION = "attribute.page"; // 3
-
- public static final String ACTION_SECTION = "attribute.action"; // 1
-
- public static final String EDITOR_SECTION = "attribute.editor"; // 1
-
- public static final String TOP_SECTION = "top"; // 0
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java
deleted file mode 100644
index 14aa8b0f7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section.LinkSection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-
-/**
- * @author jchoi
- * @version
- */
-public class LinkSectionDescriptor implements ISectionDescriptor {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.LINK_SECTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
- */
- public ITypeMapper getFilter() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new LinkSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.ATTRIBUTE_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof PageflowLinkEditPart) {
- PageflowLink pfLink = (PageflowLink) ((PageflowLinkEditPart) object).getModel();
- if (PageflowValidation.getInstance().isValidLinkForProperty(
- pfLink)) {
-
- return true;
- }
-
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ITabbedPropertiesConstants.TOP_SECTION;
- }
-
- public int getEnablesFor() {
- // TODO Auto-generated method stub
- return ENABLES_FOR_ANY;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java
deleted file mode 100644
index d3a0b13f4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * Dialog Cell Editor for Page path browser.
- *
- * @author Xiao-guang Zhang
- */
-public class PagePathDialogCellEditor extends EditableDialogCellEditor {
- PageflowPage element;
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor()
- */
- public PagePathDialogCellEditor() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor(Composite parent)
- */
- public PagePathDialogCellEditor(Composite parent, PageflowPage element) {
- super(parent);
- this.element = element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#DialogCellEditor(Composite parent, int style)
- */
- public PagePathDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String jsfSelection = "";
- if (getDefaultText() != null && getDefaultText().getText().length() > 0) {
- jsfSelection = getDefaultText().getText();
- IProject project = WebrootUtil.getProject(element);
- ProjectWebPageSelectionDialog dlg = new ProjectWebPageSelectionDialog(
- cellEditorWindow.getShell(), project);
- if (dlg.open() == Window.OK) {
- jsfSelection = dlg.getResultFilePath();
- }
- }
- return jsfSelection;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java
deleted file mode 100644
index 3c5bdcaf0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section.PageSection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISection;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITypeMapper;
-
-/**
- * @author jchoi
- * @version
- */
-public class PageSectionDescriptor implements ISectionDescriptor {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.PAGE_SECTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
- */
- public ITypeMapper getFilter() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new PageSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.ATTRIBUTE_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof PageflowNodeEditPart) {
- Object model = ((PageflowNodeEditPart) object).getModel();
- if (model instanceof PageflowPageImpl) {
- return true;
- }
- }
- }
- return false;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ITabbedPropertiesConstants.TOP_SECTION;
- }
-
- public int getEnablesFor() {
- // TODO Auto-generated method stub
- return ENABLES_FOR_ANY;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java
deleted file mode 100644
index 40e4db369..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * This class is intended to be a generic property source for all the objects in
- * the application's model. It currently only supports String and boolean types,
- * and doesn't support reset or nested properties. It uses information in the
- * EMF EAttribute and EDataType classes to get the id, display name, and type
- * information.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowElementPropertySource implements IPropertySource {
- /** attribute name of "path" and "action", which have special property editor */
- private static final String PAGEFLOW_PATH = "path"; //$NON-NLS-1$
-
- static final String PAGEFLOW_NAME = "name"; //$NON-NLS-1$
-
- static final String PAGEFLOW_COMMENT = "comment"; //$NON-NLS-1$
-
- private static final String PAGEFLOW_CONFIG_FILE = "configfile"; //$NON-NLS-1$
-
- /** pageflow elememt */
- PageflowElement element;
-
- /** boolean value's label */
- private static final String P_VALUE_TRUE_LABEL = PageflowMessages.Pageflow_Label_True;
-
- private static final String P_VALUE_FALSE_LABEL = PageflowMessages.Pageflow_Label_False;
-
- /** Integer value for boolean type */
- private static final int P_VALUE_TRUE = 0;
-
- private static final int P_VALUE_FALSE = 1;
-
- static class BooleanLabelProvider extends LabelProvider {
- public String getText(Object element) {
- String[] values = new String[] { P_VALUE_TRUE_LABEL,
- P_VALUE_FALSE_LABEL };
- return values[((Integer) element).intValue()];
- }
-
- public Image getImage(Object element) {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_BooleanValue.gif"); //$NON-NLS-1$
- }
- }
-
- static class PageflowLabelProvider extends LabelProvider {
-
- public Image getImage(Object element) {
- if (element instanceof String) {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_TextValue.gif");//$NON-NLS-1$
- } else if (element instanceof Integer) {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_IntegralValue.gif");//$NON-NLS-1$
- } else {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_GenericValue.gif");//$NON-NLS-1$
- }
- }
- }
-
- /**
- * constructor
- *
- * @param element -
- * pageflow element model.
- */
- public PageflowElementPropertySource(PageflowElement element) {
- this.element = element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#getEditableValue()
- */
- public Object getEditableValue() {
- return element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#getPropertyDescriptors()
- */
- public IPropertyDescriptor[] getPropertyDescriptors() {
- // property descriptors
- List propertyDescriptors = new Vector();
-
- // if (element instanceof PageflowLink) {
- // return getLinkPropertyDescriptors();
- // }
-
- Iterator it;
- EClass cls = element.eClass();
-
- it = cls.getEAllAttributes().iterator();
- while (it.hasNext()) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.isID()
- || attr.getFeatureID() == PageflowPackage.PAGEFLOW__REFERENCE_LINK) {
- continue;
- }
- EDataType type = attr.getEAttributeType();
- if (type.getInstanceClass() == String.class) {
- PropertyDescriptor propertyDescriptor;
- if (attr.getName().equalsIgnoreCase(PAGEFLOW_PATH)) {
- propertyDescriptor = getPagePathPropertyDescriptor(attr);
- } else if (attr.getName()
- .equalsIgnoreCase(PAGEFLOW_CONFIG_FILE)) {
- propertyDescriptor = null;
- } else {
- propertyDescriptor = new TextPropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr
- .getName()));
- }
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
-
- } else if (type.getInstanceClass() == boolean.class) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = getBooleanTypePropertyDescriptor(attr);
- propertyDescriptor.setLabelProvider(new BooleanLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
-
- return (IPropertyDescriptor[]) propertyDescriptors
- .toArray(new IPropertyDescriptor[] {});
- }
-
- /**
- * @return
- */
- private IPropertyDescriptor[] getLinkPropertyDescriptors() {
- // property descriptors
- List propertyDescriptors = new Vector();
-
- Iterator it;
- EClass cls = element.eClass();
-
- it = cls.getEAllAttributes().iterator();
- while (it.hasNext()) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.isID()
- || attr.getName().equalsIgnoreCase(PAGEFLOW_NAME)
- || attr.getName().equalsIgnoreCase(PAGEFLOW_COMMENT)
- || attr.getFeatureID() == PageflowPackage.PAGEFLOW__REFERENCE_LINK) {
- continue;
- }
-
- EDataType type = attr.getEAttributeType();
- if (type.getInstanceClass() == String.class) {
- PropertyDescriptor propertyDescriptor;
-
- propertyDescriptor = new TextPropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr
- .getName()));
-
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
-
- } else if (type.getInstanceClass() == boolean.class) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = getBooleanTypePropertyDescriptor(attr);
- propertyDescriptor.setLabelProvider(new BooleanLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
-
- return (IPropertyDescriptor[]) propertyDescriptors
- .toArray(new IPropertyDescriptor[] {});
- }
-
- /**
- * get the property descriptor for the attribute "path" of page component
- *
- * @param attr -
- * EAttribute
- * @return
- */
- private PropertyDescriptor getPagePathPropertyDescriptor(EAttribute attr) {
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName())) {
- public CellEditor createPropertyEditor(Composite parent) {
- CellEditor editor = new PagePathDialogCellEditor(parent,
- (PageflowPage) element);
- if (getValidator() != null) {
- editor.setValidator(getValidator());
- }
- return editor;
- }
-
- /**
- * Returns the input validator for editing the property.
- *
- * @return the validator used to verify correct values for this
- * property, or <code>null</code>
- */
- protected ICellEditorValidator getValidator() {
- return new ICellEditorValidator() {
- public String isValid(Object value) {
- if (((PageflowPage) element).getPath() != null
- && value != null
- && !((PageflowPage) element).getPath()
- .equalsIgnoreCase((String) value)) {
- if (PageflowValidation.getInstance().isExistedPage(
- ((PageflowPage) element).getPageflow(),
- (String) value)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle
- // = Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage =
- // The web page {0} is already existed in
- // current PageFlow.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle",
- "Pageflow.PageflowEditor.Alert.ExistingPage",
- (String) value);
-
- return EditorPlugin
- .getResourceString("Pageflow.PageflowEditor.Alert.ExistingPage");
- }
- }
- return null;
- }
-
- };
- }
-
- };
- return propertyDescriptor;
- }
-
- /**
- * get the property descriptor for the attribute "action" of Action
- * component
- *
- * @param attr -
- * EAttribute
- * @return
- */
- private PropertyDescriptor getActionPropertyDescriptor(EAttribute attr) {
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName())) {
- public CellEditor createPropertyEditor(Composite parent) {
- CellEditor editor = new ActionDialogCellEditor(parent);
- if (getValidator() != null) {
- editor.setValidator(getValidator());
- }
- return editor;
- }
-
- /**
- * Returns the input validator for editing the property.
- *
- * @return the validator used to verify correct values for this
- * property, or <code>null</code>
- */
- protected ICellEditorValidator getValidator() {
- return new ICellEditorValidator() {
- public String isValid(Object value) {
-
- return null;
- }
-
- };
- }
- };
- return propertyDescriptor;
- }
-
- /**
- * get the property descriptor for the attribute "outcome" of Link component
- *
- * @param attr -
- * EAttribute
- * @return
- */
- private PropertyDescriptor getActionOutcomePropertyDescriptor(
- EAttribute attr) {
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName())) {
- public CellEditor createPropertyEditor(Composite parent) {
- CellEditor editor = new ActionOutcomeDialogCellEditor(parent,
- element);
- if (getValidator() != null) {
- editor.setValidator(getValidator());
- }
- return editor;
- }
- };
- return propertyDescriptor;
- }
-
- /**
- * get property descriptor for the attribute with the boolean type
- *
- * @param attr -
- * EAttribute
- * @return
- */
- PropertyDescriptor getBooleanTypePropertyDescriptor(EAttribute attr) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = new ComboBoxPropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName()),
- new String[] { P_VALUE_TRUE_LABEL, P_VALUE_FALSE_LABEL });
- return propertyDescriptor;
- }
-
- /**
- * Get a translated string from the resource locator.
- */
- protected String getString(String key) {
- if ("comment".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_comment;
- }
-
- if ("name".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_name;
- }
-
- if ("largeicon".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_largeicon;
- }
-
- if ("smallicon".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_smallicon;
- }
-
- if ("source".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_source;
- }
-
- if ("target".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_target;
- }
-
- if ("fromaction".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_fromaction;
- }
-
- if ("path".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_path;
- }
- if ("begin".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_begin;
- }
- if ("end".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_end;
- }
- if ("configfile".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_configfile;
- }
- if ("outcome".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_outcome;
- }
- if ("redirect".equals(key)) {
- return PageflowMessages.Pageflow_Model_Attributes_redirect;
- }
-
- return "";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#getPropertyValue(Object)
- */
- public Object getPropertyValue(Object id) {
- EStructuralFeature feature = element.eClass().getEStructuralFeature(
- Integer.parseInt((String) id));
-
- Object result = element.eGet(feature);
-
- if (result instanceof Boolean) {
- if (result == Boolean.TRUE) {
- result = new Integer(P_VALUE_TRUE);
- } else {
- result = new Integer(P_VALUE_FALSE);
- }
- }
-
- return result != null ? result : "";
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#isPropertySet(Object)
- */
- public boolean isPropertySet(Object id) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySouce#resetPropertyValue(Object)
- */
- public void resetPropertyValue(Object id) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#setPropertyValue(Object, Object)
- */
- public void setPropertyValue(Object id, Object value) {
- EStructuralFeature feature = element.eClass().getEStructuralFeature(
- Integer.parseInt((String) id));
-
- Object result = element.eGet(feature);
- // if the attribute is boolean type, the value should be changed from
- // string "true" or "false"
- // to Boolean.TRUE or Boolean.FALSE
- if (result instanceof Boolean) {
- if (value.equals(new Integer(P_VALUE_TRUE))) {
- value = Boolean.TRUE;
- } else {
- value = Boolean.FALSE;
- }
- }
- element.eSet(feature, value);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java
deleted file mode 100644
index 8fdeef71f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * The property source for Pageflow Link.
- *
- * @author hmeng
- */
-
-public class PageflowLinkPropertySource extends PageflowElementPropertySource {
-
- public PageflowLinkPropertySource(PageflowElement element) {
- super(element);
- // TODO Auto-generated constructor stub
- }
-
- public Object getPropertyValue(Object id) {
- Object result = super.getPropertyValue(id);
- if (Integer.parseInt((String) id) == PageflowPackage.PF_LINK__SOURCE
- || Integer.parseInt((String) id) == PageflowPackage.PF_LINK__TARGET) {
- result = ((PageflowPage) result).getPath();
- }
- return result;
- }
-
- public void setPropertyValue(Object id, Object value) {
- if (Integer.parseInt((String) id) == PageflowPackage.PF_LINK__SOURCE) {
- ((PageflowLink) element).setSourcePath((String) value);
-
- } else if (Integer.parseInt((String) id) == PageflowPackage.PF_LINK__TARGET) {
- ((PageflowLink) element).setTargetPath((String) value);
- } else {
- super.setPropertyValue(id, value);
- }
- }
-
- public IPropertyDescriptor[] getPropertyDescriptors() {
- // property descriptors
- List propertyDescriptors = new Vector();
-
- Iterator it;
- EClass cls = element.eClass();
-
- it = cls.getEAllAttributes().iterator();
- while (it.hasNext()) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.isID()
- || attr.getName().equalsIgnoreCase(PAGEFLOW_NAME)
- || attr.getName().equalsIgnoreCase(PAGEFLOW_COMMENT)
- || attr.getFeatureID() == PageflowPackage.PAGEFLOW__REFERENCE_LINK) {
- continue;
- }
-
- EDataType type = attr.getEAttributeType();
- if (type.getInstanceClass() == String.class) {
- PropertyDescriptor propertyDescriptor;
-
- propertyDescriptor = new TextPropertyDescriptor(Integer
- .toString(attr.getFeatureID()),
- getString(attr.getName()));
-
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
-
- } else if (type.getInstanceClass() == boolean.class) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = getBooleanTypePropertyDescriptor(attr);
- propertyDescriptor.setLabelProvider(new BooleanLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
- it = cls.getEReferences().iterator();
- while (it.hasNext()) {
- EReference attr = (EReference) it.next();
- if (attr.getFeatureID() == PageflowPackage.PF_LINK__SOURCE
- || attr.getFeatureID() == PageflowPackage.PF_LINK__TARGET) {
-
- PropertyDescriptor propertyDescriptor;
-
- propertyDescriptor = getExistingPagePathPropertyDescriptor(attr);
-
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
- }
-
- return (IPropertyDescriptor[]) propertyDescriptors
- .toArray(new IPropertyDescriptor[] {});
- }
-
- /**
- * The link's ends can be modified to another page existing in current pageflow.
- * @param attr
- * @return
- */
- private PropertyDescriptor getExistingPagePathPropertyDescriptor(
- EReference attr) {
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName())) {
- public CellEditor createPropertyEditor(Composite parent) {
- CellEditor editor = new ExistingPagePathDialogCellEditor(
- parent, (Pageflow) element.eContainer());
- if (getValidator() != null) {
- editor.setValidator(getValidator());
- }
- return editor;
- }
-
- /**
- * Returns the input validator for editing the property.
- *
- * @return the validator used to verify correct values for this
- * property, or <code>null</code>
- */
- protected ICellEditorValidator getValidator() {
- return new ICellEditorValidator() {
- public String isValid(Object value) {
- if (value != null) {
- if (!PageflowValidation.getInstance()
- .isExistedPage(
- ((Pageflow) element.eContainer()),
- (String) value)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle
- // = Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage =
- // The web page {0} is already existed in
- // current PageFlow.
- EditorPlugin.getAlerts().info("Note",
- "Please select an existing page");
- // "Pageflow.PageflowEditor.Alert.DNDResourceTitle",
- // "Pageflow.PageflowEditor.Alert.ExistingPage",
- // (String) value);
-
- return EditorPlugin
- .getResourceString("Pageflow.PageflowEditor.Alert.ExistingPage");
- }
- }
- return null;
- }
-
- };
- }
-
- };
- return propertyDescriptor;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java
deleted file mode 100644
index f795feef2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptorProvider;
-
-/**
- * this class defines all section descriptors for pageflow. Similar with
- * PropertyDescriptors, this class defines all sections used by pageflow through
- * SectionDescriptor.
- *
- */
-public class PageflowSectionDescriptorProvider implements
- ISectionDescriptorProvider {
- public PageflowSectionDescriptorProvider() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptorProvider#getSectionDescriptors()
- */
- public ISectionDescriptor[] getSectionDescriptors() {
- ISectionDescriptor[] descriptors = new ISectionDescriptor[] {
- new LinkSectionDescriptor(), new PageSectionDescriptor(),
- new EditorSectionDescriptor(),
- new GeneralViewSectionDescriptor() };
- return descriptors;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java
deleted file mode 100644
index 28f5eb13a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementTreeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This class defines label provider for the property view's title. Tabbed
- * property view has a common area as a Title. Different decription and image
- * can be shown according to Different selection.
- *
- */
-public class PageflowSectionLabelProvider extends LabelProvider {
-
- public PageflowSectionLabelProvider() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see getImage(java.lang.Object)
- */
- public Image getImage(Object object) {
- Image result = EditorPlugin.getDefault().getImage(
- "facesconfig/FacesConfig_Pageflow16.gif");
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see getText(java.lang.Object)
- */
- public String getText(Object object) {
- String result = null;
- if (object instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) object;
- Object pageflow = structuredSelection.getFirstElement();
- if (pageflow instanceof PageflowElementEditPart
- || pageflow instanceof PageflowLinkEditPart
- || pageflow instanceof PageflowElementTreeEditPart) {
-
- if (((PageflowElement) ((AbstractEditPart) pageflow).getModel())
- .eClass() == PageflowPackage.eINSTANCE.getPageflow()) {
- result = PageflowMessages.Pageflow_Model_Items_Pageflow;
- } else if (((PageflowElement) ((AbstractEditPart) pageflow)
- .getModel()).eClass() == PageflowPackage.eINSTANCE
- .getPFPage()) {
- result = PageflowMessages.Pageflow_Model_Items_PFPage;
- } else if (((PageflowElement) ((AbstractEditPart) pageflow)
- .getModel()).eClass() == PageflowPackage.eINSTANCE
- .getPFLink()) {
- result = PageflowMessages.Pageflow_Model_Items_PFLink;
- }
- }
- }
- return result;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
deleted file mode 100644
index 365496db1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.facesconfig.common.dialogs.CommonResourceDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author hmeng
- */
-
-public class ProjectWebPageSelectionDialog extends CommonResourceDialog {
-
- public ProjectWebPageSelectionDialog(Shell parentShell, IProject project,
- int style) {
- super(parentShell, project, style);
- init();
- }
-
- public ProjectWebPageSelectionDialog(Shell parentShell, IProject project) {
- super(parentShell, project);
- init();
- }
-
- public ProjectWebPageSelectionDialog(Shell parentShell, IFolder folder,
- int style) {
- super(parentShell, folder, style);
- init();
- }
-
- private void init() {
- setResourceDescription("Web page");
- setSuffixs(new String[] { "jsp", "jspx", "jsf", "html", "htm" });
- }
-
- public String getResultFilePath() {
- String result = "";
- IFile selectedFile = (IFile) getResult()[0];
- IPath path = selectedFile.getProjectRelativePath();
- path = path.removeFirstSegments(1);
- result = "/" + path.toString();
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java
deleted file mode 100644
index e803844ff..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class PropertyMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages";
-
- private PropertyMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, PropertyMessages.class);
- }
-
- public static String property_displayName;
-
- public static String property_description;
-
- public static String property_configFile;
-
- public static String property_largeIcon;
-
- public static String property_smallIcon;
-
- public static String property_fromAction;
-
- public static String property_fromView;
-
- public static String property_fromOutcome;
-
- public static String property_redirect;
-
- public static String property_browseButton;
-
- public static String property_Command_SetValue;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties
deleted file mode 100644
index 500646ebc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-property_displayName=Display Name:
-property_description=Description:
-property_configFile=Faces-config file:
-property_largeIcon=Large Icon:
-property_smallIcon=Small Icon:
-property_fromAction=From Action:
-property_fromView=Page Path:
-property_fromOutcome=From Outcome:
-property_redirect=Redirect:
-property_browseButton=...
-
-property_Command_SetValue=Set {0} Property
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java
deleted file mode 100644
index 1b44cc4be..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-public abstract class AbstractEditPartGroup extends DialogFieldGroup {
-
- private StringDialogField descField;
-
- private StringDialogField displayNameField;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- displayNameField = new StringDialogField();
- displayNameField.setLabelText(PropertyMessages.property_displayName);
- displayNameField
- .setDialogFieldChangeListener(getDefaultChangeListener());
- descField = new StringDialogField();
- ;
- descField.setLabelText(PropertyMessages.property_description);
- descField.setDialogFieldChangeListener(getDefaultChangeListener());
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent,
- int col) {
- displayNameField.doFillIntoGrid(toolkit, parent, col);
- descField.doFillIntoGrid(toolkit, parent, col);
-
- }
-
- protected void refreshData(PageflowElement elem) {
- descField.setTextWithoutUpdate(elem.getComment());
- displayNameField.setTextWithoutUpdate(elem.getName());
- }
-
- public StringDialogField getDescField() {
- return descField;
- }
-
- public StringDialogField getDisplayNameField() {
- return displayNameField;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
-
- return null;
- }
-
- protected String assertString(String value) {
- return value == null ? "" : value;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java
deleted file mode 100644
index 307063c23..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.common.ui.properties.internal.provisional.AbstractPropertySection;
-
-/**
- * This is base section, which support GEF command stack to redo/undo setting
- * properties.
- *
- * @author jchoi, Xiao-guang Zhang
- */
-public abstract class AbstractEditPartSection extends AbstractPropertySection {
-
- IDialogFieldChangeListener changeListener = new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- validate();
- }
- };
-
- /** property source of edit part */
- private IPropertySource propertySource;
-
- /** EditPart instance */
- private EditPart editPart;
-
- /** map for property registry to store a map between the property id and name */
- private Map propertyRegistry;
-
- /** GEF command stack */
- private CommandStack commandStack;
-
- /** command stack listener to refresh the section */
- private CommandStackListener commandStackListener;
-
- /**
- *
- */
- public AbstractEditPartSection() {
- super();
- }
-
- /**
- * refresh the whole section
- *
- */
- public void refreshData() {
- super.refresh();
- }
-
- public void validate() {
- }
-
- /**
- * dispose the command stack listener
- */
- public void dispose() {
- super.dispose();
- if (getCommandStack() != null) {
- getCommandStack().removeCommandStackListener(
- getCommandStackListener());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- if (part != null) {
- if (part.getAdapter(CommandStack.class) != null) {
- setCommandStack((CommandStack) part
- .getAdapter(CommandStack.class));
- }
-
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- if (structuredSelection.getFirstElement() instanceof EditPart) {
- editPart = (EditPart) structuredSelection.getFirstElement();
- }
-
- if (editPart instanceof IAdaptable
- && ((IAdaptable) editPart)
- .getAdapter(IPropertySource.class) != null) {
- propertySource = (IPropertySource) ((IAdaptable) editPart)
- .getAdapter(IPropertySource.class);
- }
-
- }
- }
-
- super.setInput(part, selection);
- }
-
- /**
- * get the commandstacklistener, if not existed, create a new one.
- *
- * @return
- */
- private CommandStackListener getCommandStackListener() {
- if (commandStackListener == null) {
- commandStackListener = new CommandStackListener() {
- public void commandStackChanged(EventObject e) {
- refreshData();
- }
- };
- }
- return commandStackListener;
- }
-
- /**
- * set a <code>CommandStack</code> forthis section, and add a
- * <code>CommandStackListener</code> for this commandstack
- *
- * @param stack
- */
- public void setCommandStack(CommandStack stack) {
- commandStack = stack;
- stack.addCommandStackListener(getCommandStackListener());
- }
-
- /**
- * get the <code>CommandStack</code>
- *
- * @return
- */
- public CommandStack getCommandStack() {
- return commandStack;
- }
-
- /**
- * get the property source registered for current editpart
- *
- * @return
- */
- public IPropertySource getPropertySource() {
- return propertySource;
- }
-
- /**
- * get the property's EMF featureID based on property name.
- *
- * @param propertyName
- * @return
- */
- protected Object getFeatureID(String propertyName) {
- if (editPart != null && !(editPart.getModel() instanceof EObject)) {
- return null;
- }
-
- Object propertyID = getPropertyRegistry().get(propertyName);
- if (propertyID == null) {
-
- EClass cls = ((EObject) editPart.getModel()).eClass();
- for (Iterator it = cls.getEAllAttributes().iterator(); it.hasNext();) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.getName().equalsIgnoreCase(propertyName)) {
- propertyID = Integer.toString(attr.getFeatureID());
- getPropertyRegistry().put(propertyName, propertyID);
- break;
- }
- }
- }
- return propertyID;
- }
-
- /**
- * get the property registry
- *
- * @return
- */
- protected Map getPropertyRegistry() {
- if (propertyRegistry == null) {
- propertyRegistry = new HashMap();
- }
- return propertyRegistry;
- }
-
- /**
- * get the input edit part
- *
- * @return
- */
- public Object getInput() {
- return editPart;
- }
-
- /**
- * set the value of property
- *
- * @param propertyName
- * @param propertyValue
- */
- public void setValue(String propertyName, Object propertyValue) {
- if (propertyName != null && propertyValue != null
- && getPropertySource() != null) {
- SetPropertyValueCommand setCommand = new SetPropertyValueCommand(
- (String) propertyName);
- setCommand.setTarget(getPropertySource());
- setCommand.setPropertyId(getFeatureID(propertyName));
- setCommand.setPropertyValue(propertyValue);
- if (getCommandStack() != null) {
- getCommandStack().execute(setCommand);
- } else {
- setCommand.execute();
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java
deleted file mode 100644
index ec925127b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-public class EditorGroup extends AbstractEditPartGroup {
- private Pageflow pageflow = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- super.initialize();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- if (pageflow != null) {
- super.refreshData((PageflowElement) pageflow);
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- Composite top;
- if (toolkit == null) {
- top = new Composite(parent, SWT.NONE);
- } else {
- top = toolkit.createComposite(parent);
- }
- FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
- parent.setLayout(fillLayout);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- top.setLayout(layout);
-
- Label separator = toolkit.createSeparator(top, SWT.HORIZONTAL);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 3;
- separator.setLayoutData(data);
- super.layoutDialogFields(toolkit, top, 3);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- /**
- * @param _provider
- */
- public void setPropertyProvider(Pageflow elem) {
- pageflow = elem;
- this.refreshData();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java
deleted file mode 100644
index 2810a03fd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-
-/**
- * Edit section for Pagflow (EditPart)
- *
- * @author jchoi, Xiao-guang Zhang
- */
-public class EditorSection extends AbstractEditPartSection {
- /** edit group */
- private EditorGroup group;
-
- /** the emf model for Pageflow */
- private Pageflow pageflow;
-
- /**
- *
- */
- public EditorSection() {
- super();
- group = new EditorGroup();
- group.setDefaultChangeListener(changeListener);
- group.initialize();
-
- group.getDisplayNameField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- EditorSection.this.setValue(
- PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Name().getName(),
- group.getDisplayNameField().getText());
- }
- });
-
- group.getDescField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- EditorSection.this
- .setValue(
- PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Comment()
- .getName(), group
- .getDescField().getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
- * org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage aTabbedPropertySheetPage) {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage
- .getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- group.layoutDialogFields(factory, top);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
- if (getInput() != null && getInput() instanceof PageflowEditPart) {
- Object model = ((PageflowEditPart) getInput()).getModel();
- if (model instanceof Pageflow) {
- pageflow = (Pageflow) model;
- refreshData();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.properties.sections.AbstractEditPartSection#refreshData()
- */
- public void refreshData() {
- super.refreshData();
- group.setPropertyProvider(pageflow);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java
deleted file mode 100644
index 8f32448a8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ActionOutcomeSelectionDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ITabbedPropertiesConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-public class LinkGroup extends AbstractEditPartGroup {
- private StringButtonDialogField fromOutcomeField;
-
- private StringDialogField fromActionField;
-
- private ComboDialogField redirectField;
-
- private PageflowLink pfLink;
-
- /** Integer value for boolean type */
- private static final Integer P_VALUE_TRUE = new Integer(0);
-
- private static final Integer P_VALUE_FALSE = new Integer(1);
-
- private class StringButtonAdapter implements IStringButtonAdapter {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.IStringButtonAdapter#changeControlPressed(org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogField)
- */
- public void changeControlPressed(DialogField field) {
- String outcome = "";
- String jspPage = "";
- Shell shell = field.getLabelControl(null, null).getShell();
- if (pfLink != null) {
- outcome = pfLink.getOutcome();
- jspPage = WebrootUtil.getProjectPath(pfLink,
- getPreviousJSPPath(pfLink));
- ActionOutcomeSelectionDialog actionDialog = new ActionOutcomeSelectionDialog(
- shell, outcome, jspPage);
- if (actionDialog.open() == Window.OK) {
- outcome = actionDialog.getSelectedAction();
- fromOutcomeField.setText(outcome);
- pfLink.setOutcome(outcome);
- refreshData();
- }
- }
- }
-
- /**
- * @param _element
- * @return
- */
- private String getPreviousJSPPath(PageflowElement element) {
- String jspPath = null;
- if (element instanceof PageflowLink) {
- PageflowNode source = ((PageflowLink) element).getSource();
- if (source instanceof PageflowPage) {
- jspPath = ((PageflowPage) source).getPath();
- }
- }
- return jspPath;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- fromOutcomeField = new StringButtonDialogField(
- new StringButtonAdapter());
- fromOutcomeField.setLabelText(PropertyMessages.property_fromOutcome);
- fromOutcomeField.setButtonLabel("...");
- fromOutcomeField
- .setDialogFieldChangeListener(getDefaultChangeListener());
- fromActionField = new StringDialogField();
- fromActionField.setLabelText(PropertyMessages.property_fromAction);
- fromActionField
- .setDialogFieldChangeListener(getDefaultChangeListener());
- redirectField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY);
- redirectField.setLabelText(PropertyMessages.property_redirect);
- redirectField
- .setDialogFieldChangeListener((getDefaultChangeListener()));
- List redirectList;
- redirectList = new ArrayList();
- redirectList.add(Boolean.TRUE.toString());
- redirectList.add(Boolean.FALSE.toString());
- redirectField.setItems((String[]) redirectList.toArray(new String[0]));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- if (pfLink != null) {
- fromOutcomeField.setTextWithoutUpdate(pfLink.getOutcome());
- fromActionField.setTextWithoutUpdate(pfLink.getFromaction());
- if (pfLink.isRedirect()) {
- redirectField.setTextWithoutUpdate(Boolean.TRUE.toString());
- } else {
- redirectField.setTextWithoutUpdate(Boolean.FALSE.toString());
- }
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- Composite top;
- if (toolkit == null) {
- top = new Composite(parent, SWT.NONE);
- } else {
- top = toolkit.createComposite(parent);
- }
- FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
- parent.setLayout(fillLayout);
-
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- fromActionField.doFillIntoGrid(toolkit, top, numberOfColumns);
- fromOutcomeField.doFillIntoGrid(toolkit, top, numberOfColumns);
- redirectField.doFillIntoGrid(toolkit, top, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(fromOutcomeField.getTextControl(
- toolkit, top));
- GridData data = new GridData();
- data.widthHint = ITabbedPropertiesConstants.BROWSE_WIDTH;
- data.heightHint = ITabbedPropertiesConstants.BROWSE_HEIGHT;
-
- fromOutcomeField.getChangeControl(toolkit, top).setLayoutData(data);
-
- }
-
- public void setPropertyProvider(PageflowLink elem) {
- pfLink = elem;
- this.refreshData();
- }
-
- public StringButtonDialogField getFromOutcomeField() {
- return fromOutcomeField;
- }
-
- public StringDialogField getFromActionField() {
- return fromActionField;
- }
-
- public ComboDialogField getRedirectField() {
- return redirectField;
- }
-
- public Integer getRedirectValue() {
- if (redirectField.getText().equalsIgnoreCase(Boolean.TRUE.toString())) {
- return LinkGroup.P_VALUE_TRUE;
- } else {
- return LinkGroup.P_VALUE_FALSE;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java
deleted file mode 100644
index 2d8bfd69b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-
-/**
- * Edit section for Pagflow Link element (EditPart)
- *
- * @author jchoi
- */
-public class LinkSection extends AbstractEditPartSection {
- /** edit group */
- private LinkGroup group;
-
- /** the emf model for Pageflow link */
- private PageflowLink pfLink;
-
- /**
- *
- */
- public LinkSection() {
- super();
- group = new LinkGroup();
- group.setDefaultChangeListener(changeListener);
- group.initialize();
-
- group.getFromOutcomeField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- LinkSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFLink_Outcome().getName(), group
- .getFromOutcomeField().getText());
- }
- });
-
- group.getRedirectField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- LinkSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFLink_Redirect().getName(), group
- .getRedirectValue());
- }
- });
- group.getFromActionField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- LinkSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFLink_Fromaction().getName(), group
- .getFromActionField().getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
- * org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage aTabbedPropertySheetPage) {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage
- .getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- group.layoutDialogFields(factory, top);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
- if (getInput() != null && getInput() instanceof PageflowLinkEditPart) {
- Object model = ((PageflowLinkEditPart) getInput()).getModel();
- if (model instanceof PageflowLink) {
- pfLink = (PageflowLink) model;
- if (PageflowValidation.getInstance().isValidLinkForProperty(
- pfLink)) {
- refreshData();
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.properties.sections.AbstractEditPartSection#refreshData()
- */
- public void refreshData() {
- super.refresh();
- group.setPropertyProvider(pfLink);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java
deleted file mode 100644
index b1781b7a8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ITabbedPropertiesConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ProjectWebPageSelectionDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-public class PageGroup extends AbstractEditPartGroup {
-
- private StringButtonDialogField fromViewField;
-
- private PageflowPage pfPage = null;
-
- private StringDialogField largeIconField;
-
- private StringDialogField smallIconField;
-
- class StringButtonAdapter implements IStringButtonAdapter {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.IStringButtonAdapter#changeControlPressed(org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogField)
- */
- public void changeControlPressed(DialogField field) {
- IProject project = WebrootUtil.getProject(pfPage);
- ProjectWebPageSelectionDialog dlg = new ProjectWebPageSelectionDialog(
- field.getLabelControl(null, null).getShell(), project);
- if (dlg.open() == Window.OK) {
- fromViewField.setText(dlg.getResultFilePath());
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- fromViewField = new StringButtonDialogField(new StringButtonAdapter());
- fromViewField.setLabelText(PropertyMessages.property_fromView);
- fromViewField.setButtonLabel("...");
- fromViewField.setDialogFieldChangeListener(getDefaultChangeListener());
-
- largeIconField = new StringDialogField();
- largeIconField.setLabelText(PropertyMessages.property_largeIcon);
- largeIconField
- .setDialogFieldChangeListener((getDefaultChangeListener()));
- smallIconField = new StringDialogField();
- smallIconField.setLabelText(PropertyMessages.property_smallIcon);
- smallIconField
- .setDialogFieldChangeListener((getDefaultChangeListener()));
- super.initialize();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- if (pfPage != null) {
- fromViewField.setTextWithoutUpdate(assertString(pfPage.getPath()));
- largeIconField.setTextWithoutUpdate(assertString(pfPage
- .getLargeicon()));
- smallIconField.setTextWithoutUpdate(assertString(pfPage
- .getSmallicon()));
- super.refreshData((PageflowElement) pfPage);
-
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- Composite top;
- if (toolkit == null) {
- top = new Composite(parent, SWT.NONE);
- } else {
- top = toolkit.createComposite(parent);
- }
- FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
- parent.setLayout(fillLayout);
-
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- fromViewField.doFillIntoGrid(toolkit, top, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(fromViewField.getTextControl(toolkit,
- top));
- largeIconField.doFillIntoGrid(toolkit, top, numberOfColumns);
- smallIconField.doFillIntoGrid(toolkit, top, numberOfColumns);
- super.layoutDialogFields(toolkit, top, 4);
-
- GridData data = new GridData();
- data.widthHint = ITabbedPropertiesConstants.BROWSE_WIDTH;
- data.heightHint = ITabbedPropertiesConstants.BROWSE_HEIGHT;
-
- fromViewField.getChangeControl(toolkit, top).setLayoutData(data);
- }
-
- public void setPropertyProvider(PageflowPage elem) {
- pfPage = elem;
- this.refreshData();
- }
-
- public StringButtonDialogField getFromViewField() {
- return fromViewField;
- }
-
- public StringDialogField getLargeIconField() {
- return largeIconField;
- }
-
- public StringDialogField getSmallIconField() {
- return smallIconField;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java
deleted file mode 100644
index 1076bc098..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory;
-
-/**
- * Edit section for Pagflow Page Element (EditPart)
- *
- * @author jchoi, Xiao-guang Zhang
- */
-public class PageSection extends AbstractEditPartSection {
- /** edit group */
- private PageGroup group;
-
- /** the emf model for Pageflow page */
- private PageflowPage pfPage = null;
-
- /**
- *
- */
- public PageSection() {
- super();
- group = new PageGroup();
- group.setDefaultChangeListener(changeListener);
- group.initialize();
-
- group.getFromViewField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- if (pfPage != null) {
- String jsfNew = group.getFromViewField().getText();
- if (jsfNew != null && jsfNew.length() > 0) {
- if (PageflowValidation.getInstance()
- .isExistedPage(pfPage.getPageflow(),
- jsfNew)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle
- // = Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage
- // = The web page {0} is already existed in
- // current PageFlow.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle",
- "Pageflow.PageflowEditor.Alert.ExistingPage",
- jsfNew);
- } else {
- PageSection.this
- .setValue(
- PageflowPackageImpl.eINSTANCE
- .getPFPage_Path()
- .getName(), jsfNew);
- }
- }
- }
- }
- });
-
- group.getLargeIconField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFPage_Largeicon().getName(), group
- .getLargeIconField().getText());
- }
- });
- group.getSmallIconField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFPage_Smallicon().getName(), group
- .getSmallIconField().getText());
- }
- });
-
- group.getDescField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Comment().getName(), group
- .getDescField().getText());
- }
- });
-
- group.getDisplayNameField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Name().getName(), group
- .getDisplayNameField().getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
- * org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage aTabbedPropertySheetPage) {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage
- .getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- group.layoutDialogFields(factory, top);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
- if (getInput() != null && getInput() instanceof PageflowNodeEditPart) {
- Object model = ((PageflowNodeEditPart) getInput()).getModel();
- if (model instanceof PageflowPage) {
- pfPage = (PageflowPage) model;
- refreshData();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.properties.sections.AbstractEditPartSection#refreshData()
- */
- public void refreshData() {
- super.refreshData();
- group.setPropertyProvider(pfPage);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java
deleted file mode 100644
index 67df3ca41..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import java.text.MessageFormat;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-public class SetPropertyValueCommand extends Command {
-
- protected Object propertyValue;
-
- protected Object propertyID;
-
- protected Object undoValue;
-
- protected boolean resetOnUndo;
-
- protected IPropertySource target;
-
- public SetPropertyValueCommand() {
- super(""); //$NON-NLS-1$
- }
-
- public SetPropertyValueCommand(String propLabel) {
- super(MessageFormat.format(
- PropertyMessages.property_Command_SetValue,
- new Object[] { propLabel }).trim());
- }
-
- public boolean canExecute() {
- return true;
- }
-
- public void execute() {
- boolean wasPropertySet = getTarget().isPropertySet(propertyID);
- undoValue = getTarget().getPropertyValue(propertyID);
- if (undoValue instanceof IPropertySource) {
- undoValue = ((IPropertySource) undoValue).getEditableValue();
- }
- if (propertyValue instanceof IPropertySource) {
- propertyValue = ((IPropertySource) propertyValue)
- .getEditableValue();
- }
- getTarget().setPropertyValue(propertyID, propertyValue);
- resetOnUndo = wasPropertySet != getTarget().isPropertySet(propertyID);
- if (resetOnUndo) {
- undoValue = null;
- }
- }
-
- public IPropertySource getTarget() {
- return target;
- }
-
- public void setTarget(IPropertySource aTarget) {
- target = aTarget;
- }
-
- public void redo() {
- execute();
- }
-
- public void setPropertyId(Object pName) {
- propertyID = pName;
- }
-
- public void setPropertyValue(Object val) {
- propertyValue = val;
- }
-
- public void undo() {
- if (resetOnUndo) {
- getTarget().resetPropertyValue(propertyID);
- } else {
- getTarget().setPropertyValue(propertyID, undoValue);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java
deleted file mode 100644
index 7ab6c8fe5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.emf.ToViewIdType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * The adapter that listens to modification of faces-config and updates pageflow
- * as needed.
- *
- * @author hmeng
- *
- */
-
-public class FC2PFSynchronizer extends AdapterImpl {
- private final boolean DEBUG = false;
-
- FC2PFTransformer transformer;
-
- private static final Logger logger = EditorPlugin
- .getLogger(FC2PFSynchronizer.class);
-
- public FC2PFSynchronizer(FC2PFTransformer transformer) {
- this.transformer = transformer;
- }
-
- public Notifier getTarget() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setTarget(Notifier newTarget) {
- }
-
- public boolean isAdapterForType(Object type) {
- return type == FC2PFSynchronizer.class;
- }
-
- public void notifyChanged(Notification notification) {
- if (!isProcessorFor(notification)) {
- return;
- }
- transformer.setInEvent(true);
- try {
- int type = notification.getEventType();
- switch (type) {
- case Notification.ADD: {
- processAdd(notification);
- notifyPageflow(notification);
- break;
- }
- case Notification.SET: {
- processSet(notification);
- notifyPageflow(notification);
- break;
- }
- case Notification.REMOVE:
- processRemove(notification);
- notifyPageflow(notification);
- break;
- }
- } catch (Exception e) {
- logger.error(e);
- } finally {
- if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
- transformer.refreshFCAdapter((EObject) notification
- .getNotifier());
- transformer.refreshPFAdapter(transformer.getPageflow());
- }
- transformer.setInEvent(false);
- }
- }
-
- private boolean isProcessorFor(Notification notification) {
- boolean result = false;
- if (transformer.isListenToNotify()
- && (notification.getNotifier() instanceof EObject)) {
- if (notification.getNotifier() == transformer.getFacesConfig()) {
- // For faces-config, only navigation rule's change is awared.
- if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()) {
- result = true;
- }
- } else {
- result = true;
- }
- }
- return result;
- }
-
- private void processAdd(Notification notification) {
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_NavigationCase()) {
- if (DEBUG)
- System.out.println("New navigation case");
- NavigationCaseType newCase = (NavigationCaseType) notification
- .getNewValue();
- transformer.updatePageflowElements(transformer.getPageflow(),
- newCase);
- } else if (feature == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()) {
- NavigationRuleType newRule = (NavigationRuleType) notification
- .getNewValue();
- if (newRule.getNavigationCase().size() > 0) {
- for (int i = 0; i < newRule.getNavigationCase().size(); i++) {
- transformer.updatePageflowElements(transformer
- .getPageflow(), (NavigationCaseType) newRule
- .getNavigationCase().get(i));
- }
- }
- if (DEBUG)
- System.out.println("New navigation rule");
- } else if (DEBUG)
- System.out.println("Something is added");
- }
-
- /**
- * Notify pageflow the changes.
- *
- * @param notification
- */
- private void notifyPageflow(Notification notification) {
- Assert.isTrue(notification.getNotifier() instanceof InternalEObject);
- transformer.getPageflow().notifyModelChanged(
- new ENotificationImpl((InternalEObject) notification
- .getNotifier(), Notification.SET,
- PageflowPackage.PAGEFLOW, null, null));
- }
-
- /**
- * Deal with the case when some element is removed.
- *
- * @param notification
- */
- private void processRemove(Notification notification) {
- if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_NavigationCase()) {
- if (notification.getOldValue() instanceof NavigationCaseType) {
- NavigationCaseType caseType = (NavigationCaseType) notification
- .getOldValue();
- transformer.removeLink(caseType);
- }
- if (DEBUG)
- System.out.println("Navigation case");
- } else if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType()) {
- if (notification.getOldValue() instanceof NavigationRuleType) {
- NavigationRuleType rule = (NavigationRuleType) notification
- .getOldValue();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- if (DEBUG)
- System.out.println("navigation rule");
- } else if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()) {
- if (notification.getOldValue() instanceof NavigationRuleType) {
- NavigationRuleType rule = (NavigationRuleType) notification
- .getOldValue();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- }
- if (DEBUG)
- System.out.println("Something is removed");
- }
-
- /**
- * Deal with property change.
- *
- * @param notification
- */
- private void processSet(Notification notification) {
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getFromViewIdType_TextContent()
- || feature == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_FromViewId()) {
- fromViewIdChanged(notification);
- } else if (feature == FacesConfigPackage.eINSTANCE
- .getToViewIdType_TextContent()
- || feature == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_ToViewId()) {
- toViewIdChanged(notification);
- }
- if (DEBUG)
- System.out.println("Something is set");
- }
-
- private void fromViewIdChanged(Notification notification) {
- // remove
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_FromViewId()
- && notification.getNewValue() == null
- && notification.getOldValue() instanceof FromViewIdType) {
- NavigationRuleType rule = (NavigationRuleType) notification
- .getNotifier();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- // add or change
- else if (feature == FacesConfigPackage.eINSTANCE
- .getFromViewIdType_TextContent()) {
- NavigationRuleType rule = (NavigationRuleType) ((EObject) notification
- .getNotifier()).eContainer();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- }
-
- private void toViewIdChanged(Notification notification) {
- // remove
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_ToViewId()
- && notification.getNewValue() == null
- && notification.getOldValue() instanceof ToViewIdType) {
- NavigationCaseType caseType = (NavigationCaseType) notification
- .getNotifier();
- transformer.refreshLink(caseType);
- }
- // add or change
- else if (feature == FacesConfigPackage.eINSTANCE
- .getToViewIdType_TextContent()) {
- NavigationCaseType caseType = (NavigationCaseType) ((EObject) notification
- .getNotifier()).eContainer();
- transformer.refreshLink(caseType);
- }
- }
-
- public void dispose() {
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java
deleted file mode 100644
index 47c64dc4c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java
+++ /dev/null
@@ -1,939 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromActionType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromOutcomeType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.emf.SmallIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.ToViewIdType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageReferenceElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.ReferenceElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowModelManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowTransform;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-
-/**
- * Update and synchronize pageflow from faces-config or vice-versa.
- *
- * @author hmeng
- *
- */
-
-public class FC2PFTransformer extends AdapterImpl {
-
- // For code debug.
- private static final boolean DEBUG = false;
-
- public static final int MY_NOTIFICATION_TYPE = Notification.EVENT_TYPE_COUNT + 1;
-
- public static final int MY_NOTIFICATION_TYPE1 = MY_NOTIFICATION_TYPE + 1;
-
- /**
- * The listener is active.
- */
- private boolean listenToNotify;
-
- /**
- * Avoid redundent event.
- */
- private boolean isInEvent;
-
- boolean pageflowChanged = false;
-
- /**
- * Perform operations batched.
- */
- boolean needBatchOperations = false;
-
- /**
- * Catches
- */
- private Map mapPaths2PF = new HashMap();
-
- private Map mapCases2Links = new HashMap();
-
- /**
- * The pageflow model.
- */
- private Pageflow pageflow;
-
- /**
- * The faces-config model.
- */
- FacesConfigType facesConfig;
-
- public FC2PFTransformer() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- public void setListenToNotify(boolean listenToNotify) {
- this.listenToNotify = listenToNotify;
- }
-
- private void postEMFChanged() {
- startFCNotify();
- // Refresh all facesConfig?
- facesConfig.eNotify(new ENotificationImpl(
- (InternalEObject) facesConfig, Notification.REMOVE,
- FacesConfigPackage.FACES_CONFIG_TYPE__NAVIGATION_RULE, null,
- null));
- List rules;
- rules = facesConfig.getNavigationRule();
- for (int i = 0; i < rules.size(); i++) {
- ((NavigationRuleType) rules.get(i)).eNotify(new ENotificationImpl(
- (InternalEObject) rules.get(i), Notification.REMOVE,
- FacesConfigPackage.NAVIGATION_RULE_TYPE__NAVIGATION_CASE,
- null, null));
- }
- }
-
- /**
- * Set notify adapters.
- *
- */
- private void startFCNotify() {
- TreeIterator iterator = facesConfig.eAllContents();
- while (iterator.hasNext()) {
- EObject object = (EObject) iterator.next();
- object.eSetDeliver(true);
- }
- facesConfig.eSetDeliver(true);
- }
-
- /**
- * Set not notify adapters
- *
- * @return
- */
- private TreeIterator stopFCNotify() {
- TreeIterator iterator = facesConfig.eAllContents();
- // Stop the listener
- while (iterator.hasNext()) {
- EObject object = (EObject) iterator.next();
- object.eSetDeliver(false);
- }
- facesConfig.eSetDeliver(false);
- return iterator;
- }
-
- /**
- * For performance issue, we are going to update DOM only after the EMF
- * modifications are done.
- */
- boolean isNeedBatchOperations() {
- return needBatchOperations;
- }
-
- /**
- * @param enable
- */
- public void setNeedBatchOperations(boolean enable) {
- this.needBatchOperations = enable;
- if (!enable) {
- isInEvent = true;
- postEMFChanged();
- isInEvent = false;
- } else {
- stopFCNotify();
- }
- }
-
- private void updateFacesRule(NavigationRuleType navigationRule,
- PageflowPage pageSource) {
- FacesConfigFactory factory = FacesConfigFactory.eINSTANCE;
- if (pageSource.getComment() != null) {
- DescriptionType description = factory.createDescriptionType();
- description.setTextContent(pageSource.getComment());
- navigationRule.getDescription().clear();
- navigationRule.getDescription().add(description);
- }
- // set the navigation rule's icon
- if (pageSource.getLargeicon() != null
- || pageSource.getSmallicon() != null) {
- IconType icon = factory.createIconType();
- if (pageSource.getLargeicon() != null) {
- LargeIconType largeicon = factory.createLargeIconType();
- largeicon.setTextContent(pageSource.getLargeicon());
- icon.setLargeIcon(largeicon);
- }
-
- if (pageSource.getSmallicon() != null) {
- SmallIconType smallicon = factory.createSmallIconType();
- smallicon.setTextContent(pageSource.getSmallicon());
- icon.setSmallIcon(smallicon);
- }
- navigationRule.getIcon().clear();
- navigationRule.getIcon().add(icon);
- }
- if (pageSource.getName() != null) {
- DisplayNameType displayName = factory.createDisplayNameType();
- displayName.setTextContent(pageSource.getName());
- navigationRule.getDisplayName().clear();
- navigationRule.getDisplayName().add(displayName);
- }
- }
-
- /**
- * TODO: If we cache the case's properties in a link, then we can restore
- * them.
- *
- * @param navigationCase
- * @param link
- */
- private void updateFacesCase(NavigationCaseType navigationCase,
- PageflowLink link) {
- FacesConfigFactory factory = FacesConfigFactory.eINSTANCE;
- if (link.getComment() != null) {
- DescriptionType description = factory.createDescriptionType();
- description.setTextContent(link.getComment());
- navigationCase.getDescription().clear();
- navigationCase.getDescription().add(description);
- }
- // set the navigation rule's icon
- if (link.getLargeicon() != null || link.getSmallicon() != null) {
- IconType icon = factory.createIconType();
- if (link.getLargeicon() != null) {
- LargeIconType largeicon = factory.createLargeIconType();
- largeicon.setTextContent(link.getLargeicon());
- icon.setLargeIcon(largeicon);
- }
-
- if (link.getSmallicon() != null) {
- SmallIconType smallicon = factory.createSmallIconType();
- smallicon.setTextContent(link.getSmallicon());
- icon.setSmallIcon(smallicon);
- }
- navigationCase.getIcon().clear();
- navigationCase.getIcon().add(icon);
- }
- if (link.getFromaction() != null) {
- FromActionType fromAction = factory.createFromActionType();
- fromAction.setTextContent(link.getFromaction());
- navigationCase.setFromAction(fromAction);
- }
- if (link.getOutcome() != null) {
- FromOutcomeType fromOutcome = factory.createFromOutcomeType();
- fromOutcome.setTextContent(link.getOutcome());
- navigationCase.setFromOutcome(fromOutcome);
- }
- }
-
- private void createFacesCase(PageflowLink link, PageflowPage source,
- PageflowPage target) {
- NavigationRuleType rule = FacesConfigFactory.eINSTANCE
- .createNavigationRuleType();
- FromViewIdType from = FacesConfigFactory.eINSTANCE
- .createFromViewIdType();
- from.setTextContent((source).getPath());
- rule.setFromViewId(from);
- NavigationCaseType navCase = FacesConfigFactory.eINSTANCE
- .createNavigationCaseType();
- ToViewIdType toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- toView.setTextContent((target).getPath());
- navCase.setToViewId(toView);
- rule.getNavigationCase().add(navCase);
- facesConfig.getNavigationRule().add(rule);
- updateFacesRule(rule, source);
- source.getFCElements().add(from);
- target.getFCElements().add(toView);
- link.getFCElements().add(navCase);
- mapCases2Links.put(navCase, link);
- }
-
- private void removePageflowPage(PageflowPage source) {
- Assert.isTrue(source.getOutlinks().size() == 0
- && source.getInlinks().size() == 0);
- pageflow.getNodes().remove(source);
- }
-
- void removeCase(NavigationCaseType navCase) {
- NavigationRuleType rule = (NavigationRuleType) navCase.eContainer();
- (rule).getNavigationCase().remove(navCase);
- if (rule.getNavigationCase().size() == 0) {
- facesConfig.getNavigationRule().remove(rule);
- }
- }
-
- /**
- * Remove a link in pageflow model.
- *
- * @param pLink
- */
- private void removeLink(PageflowLink pLink) {
- // Link
- PageflowPage source = (PageflowPage) pLink.getSource();
- PageflowPage target = (PageflowPage) pLink.getTarget();
- pLink.getPageflow().getLinks().remove(pLink);
- source.getOutlinks().remove(pLink);
- target.getInlinks().remove(pLink);
- // Navigation case
- pLink.getFCElements().clear();
- cleanPage(source);
- cleanPage(target);
- }
-
- /**
- * Remove a link in pageflow model.
- *
- * @param pLink
- */
- void changePFLinkStart(PageflowLink pLink, String newValue) {
- PageflowPage newPage = null;
- if ((newPage = getValidPFPageInCache(newValue)) != null) {
- if (newValue.equals(((PageflowPage) pLink.getSource()).getPath())) {
- return;
- }
- } else if ((newPage = TransformUtil.findPage(newValue, pageflow)) == null) {
- return;
- }
-
- // remove old case
- NavigationCaseType caseType = (NavigationCaseType) pLink
- .getFCElements().getData().get(0);
- NavigationRuleType rule = (NavigationRuleType) caseType.eContainer();
- removeCase(caseType);
-
- // create new rule / case
- NavigationCaseType newCase = FacesConfigFactory.eINSTANCE
- .createNavigationCaseType();
- ToViewIdType toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- toView.setTextContent(caseType.getToViewId().getTextContent());
- newCase.setToViewId(toView);
-
- NavigationRuleType newRule = FacesConfigFactory.eINSTANCE
- .createNavigationRuleType();
- FromViewIdType fromView = FacesConfigFactory.eINSTANCE
- .createFromViewIdType();
- fromView.setTextContent(newValue);
- newRule.setFromViewId(fromView);
- newRule.getNavigationCase().add(newCase);
- facesConfig.getNavigationRule().add(newRule);
-
- // update
- // updateNode(rule, newRule);
- updateNode(caseType, newCase);
-
- pLink.getFCElements().clear();
- pLink.getFCElements().add(newCase);
- pLink.setSource(newPage);
-
- updatePageflowElements(pageflow, newCase);
- }
-
- private void updateNode(EObject old, EObject newOne) {
- if (old instanceof NavigationRuleType) {
- ((NavigationRuleType) newOne).getDescription().clear();
- ((NavigationRuleType) newOne).getDescription().addAll(
- ((NavigationRuleType) old).getDescription());
- ((NavigationRuleType) newOne).getDisplayName().clear();
- ((NavigationRuleType) newOne).getDisplayName().addAll(
- ((NavigationRuleType) old).getDisplayName());
- ((NavigationRuleType) newOne).getDescription().clear();
- ((NavigationRuleType) newOne).getIcon().clear();
- ((NavigationRuleType) newOne).getIcon().addAll(
- ((NavigationRuleType) old).getIcon());
- } else if (old instanceof NavigationCaseType) {
- ((NavigationCaseType) newOne).getDescription().clear();
- ((NavigationCaseType) newOne).getDescription().addAll(
- ((NavigationCaseType) old).getDescription());
- ((NavigationCaseType) newOne).getDisplayName().clear();
- ((NavigationCaseType) newOne).getDisplayName().addAll(
- ((NavigationCaseType) old).getDisplayName());
- ((NavigationCaseType) newOne).getDescription().clear();
- ((NavigationCaseType) newOne).getIcon().clear();
- ((NavigationCaseType) newOne).getIcon().addAll(
- ((NavigationCaseType) old).getIcon());
- ((NavigationCaseType) newOne)
- .setFromAction(((NavigationCaseType) old).getFromAction());
- ((NavigationCaseType) newOne)
- .setFromOutcome(((NavigationCaseType) old).getFromOutcome());
- }
- }
-
- void changePFLinkEnd(PageflowLink pLink, String newValue) {
- PageflowPage newPage = null;
- if ((newPage = getValidPFPageInCache(newValue)) != null) {
- if (newValue.equals(((PageflowPage) pLink.getSource()).getPath())) {
- return;
- }
- } else if ((newPage = TransformUtil.findPage(newValue, pageflow)) == null) {
- return;
- }
-
- // remove old case
- NavigationCaseType caseType = (NavigationCaseType) pLink
- .getFCElements().getData().get(0);
- ToViewIdType toView = caseType.getToViewId(); // FacesConfigFactory.eINSTANCE.createToViewIdType();
- if (toView == null) {
- toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- }
- toView.setTextContent(newValue);
- caseType.setToViewId(toView);
-
- pLink.setTarget(newPage);
-
- updatePageflowElements(pageflow, caseType);
- }
-
- void removeLink(NavigationCaseType caseType) {
- PageflowLink link = (PageflowLink) mapCases2Links.get(caseType);
- if (link != null) {
- removeLink(link);
- }
- }
-
- void addLink(PageflowPage source, PageflowPage target, PageflowLink value) {
- if (source != null && target != null && value != null) {
- createFacesCase(value, (PageflowPage) source, (PageflowPage) target);
- }
- }
-
- private void cleanPage(PageflowPage source) {
- if (source.getInlinks().size() == 0 && source.getOutlinks().size() == 0) {
- removePageflowPage(source);
- }
- source.update();
- }
-
- void refreshPFAdapter(EObject object) {
- TreeIterator content = object.eAllContents();
- while (content.hasNext()) {
- Object next = content.next();
- adapt((EObject) next);
- }
- adapt(object);
- }
-
- void refreshFCAdapter(EObject object) {
- List rules = facesConfig.getNavigationRule();
- for (int i = 0; i < rules.size(); i++) {
- NavigationRuleType rule = (NavigationRuleType) rules.get(i);
- adapt(rule);
- TreeIterator children = rule.eAllContents();
- while (children.hasNext()) {
- adapt((EObject) children.next());
- }
- }
- adapt(facesConfig);
- }
-
- public void setFacesConfig(FacesConfigType facesConfig) {
- this.facesConfig = facesConfig;
- refreshFCAdapter(facesConfig);
- }
-
- public void setPageflow(Pageflow pageflow) {
- this.pageflow = pageflow;
- pageflow.eAdapters().add(this);
- refreshPFAdapter(pageflow);
- }
-
- /**
- * Install compatible synchronization adapter for particular object.
- *
- * @param object
- */
- public void adapt(EObject object) {
- if (object != null && !isAdapted(object)) {
- if (object instanceof PageflowElement) {
- object.eAdapters().add(new PF2FCSynchronizer(this));
- } else {
- object.eAdapters().add(new FC2PFSynchronizer(this));
- }
- }
- }
-
- /**
- * Remove the synchronization adapter.
- *
- * @param object
- */
- public void unAdapt(EObject object) {
- Iterator adapters = object.eAdapters().iterator();
- while (adapters.hasNext()) {
- Object adapter = adapters.next();
- if (adapter instanceof FC2PFSynchronizer
- || adapter instanceof PF2FCSynchronizer) {
- adapters.remove();
- }
- }
- }
-
- public boolean isAdapted(EObject object) {
- if (object != null) {
- Iterator adapters = object.eAdapters().iterator();
- while (adapters.hasNext()) {
- Object adapter = adapters.next();
- if (adapter instanceof FC2PFSynchronizer
- || adapter instanceof PF2FCSynchronizer) {
- return true;
- }
- }
- }
- return false;
- }
-
- public void clearCaches() {
- mapPaths2PF.clear();
- mapCases2Links.clear();
- }
-
- public void dispose() {
- clearCaches();
- getPageflow().dispose();
- }
-
- public Notifier getTarget() {
- return null;
- }
-
- public boolean isAdapterForType(Object type) {
- return false;
- }
-
- public void setTarget(Notifier newTarget) {
-
- }
-
- public static FromViewIdType getSource(NavigationCaseType caseType) {
- if (caseType.eContainer() instanceof NavigationRuleType) {
- NavigationRuleType rule = (NavigationRuleType) caseType
- .eContainer();
- return rule.getFromViewId();
- }
- return null;
- }
-
- private PageflowPage getOrCreateStartPage(NavigationCaseType navCase) {// FromViewIdType
- PageflowPage startPageflowNode = null;
- String path = "*";
- NavigationRuleType rule = (NavigationRuleType) navCase.eContainer();
- FromViewIdType source = getSource(navCase);
- if (source != null) {
- path = source.getTextContent();
- }
- if (getValidPFPageInCache(path) == null) {
- startPageflowNode = TransformUtil.findPage(path, pageflow);
-
- if (startPageflowNode == null) {
- // not exist or is "*"
- if (DEBUG)
- System.out.println("Create new start page");
- startPageflowNode = createPFPage(path);
- pageflowChanged = true;
- }
- mapPaths2PF.put(path, startPageflowNode);
- PageflowTransform.getInstance().updatePageflowSourcePage(
- startPageflowNode, rule);
- } else {
- startPageflowNode = (PageflowPage) mapPaths2PF.get(path);
- }
- if (source != null) {
- ReferenceElement element = new PageReferenceElement(
- startPageflowNode);
- element.add(source);
- startPageflowNode
- .setReferenceLink(element.resolveReferenceString());
- startPageflowNode.getFCElements().add(source);
- }
- return startPageflowNode;
- }
-
- /**
- * Search for an existing pageflow page matching to navigation case's
- * target, if there is no such page existing, create one.
- *
- * @param navCase
- * @return
- */
- private PageflowPage getOrCreateEndPage(NavigationCaseType navCase) {
- PageflowPage endPageflowNode = null;
- ToViewIdType target = navCase.getToViewId();
- if (target != null) {
- String path = target.getTextContent();
- if (getValidPFPageInCache(path) == null) {
- endPageflowNode = TransformUtil.findPage(path, pageflow);
- if (endPageflowNode == null) {
- endPageflowNode = createPFPage(path);
- if (DEBUG)
- System.out.println("Create new end page");
- pageflowChanged = true;
- }
- mapPaths2PF.put(path, endPageflowNode);
- PageflowTransform.getInstance().updatePageflowTargetPage(
- endPageflowNode, navCase);
- } else {
- endPageflowNode = (PageflowPage) mapPaths2PF.get(path);
- }
- if (target != null) {
- ReferenceElement element = new PageReferenceElement(
- endPageflowNode);
- element.add(target);
- endPageflowNode.setReferenceLink(element
- .resolveReferenceString());
- endPageflowNode.getFCElements().add(target);
- }
- }
- return endPageflowNode;
- }
-
- /**
- * Return a valid cached pageflow node.
- *
- * @param key
- * @return
- */
- private PageflowPage getValidPFPageInCache(Object key) {
- EObject element = (EObject) mapPaths2PF.get(key);
- if (!TransformUtil.isValidPageflowElement(element)
- || !(element instanceof PageflowPage)
- || !((PageflowPage) element).getPath().equals(key)) {
- mapPaths2PF.remove(key);
- element = null;
- }
- return (PageflowPage) element;
- }
-
- /**
- * Return a valid cached pageflow link.
- *
- * @param caseType
- * @return
- */
- private PageflowLink getValidPFLinkInCache(EObject caseType) {
- PageflowLink link = (PageflowLink) mapCases2Links.get(caseType);
- if (!TransformUtil.isValidLink(link)) {
- mapCases2Links.remove(caseType);
- link = null;
- }
- return link;
-
- }
-
- /**
- * Update pageflow model elements against faces-config navigation case.
- */
- public boolean updatePageflowElements(Pageflow pageflow,
- NavigationCaseType caseFC) {
- this.pageflowChanged = false;
- this.pageflow = pageflow;
- ToViewIdType target = caseFC.getToViewId();
- if (target == null) {
- return false;
- }
-
- PageflowPage start = null, end = null;
- // start page
- start = getOrCreateStartPage(caseFC);
- String action = null;
- // action
- if (caseFC.getFromAction() != null) {
- action = caseFC.getFromAction().getTextContent();
- }
- // from outcome
- String fromOutCome = null;
- if (caseFC.getFromOutcome() != null) {
- fromOutCome = caseFC.getFromOutcome().getTextContent();
- }
- // end page
- end = getOrCreateEndPage(caseFC);
- // link
- // Is there a link in pageflow model?
- PageflowLink link = null;
- if ((link = findUnmappedLink(start, end, caseFC)) == null) {
- if (end != null) {
- if (DEBUG)
- System.out.println("Create new link");
- link = createPFLink(start, end, action, fromOutCome);
- pageflowChanged = true;
- }
- }
- if (link != null) {
- link.getFCElements().clear();
- link.getFCElements().add(caseFC);
- mapCases2Links.put(caseFC, link);
- }
- adapt(start);
- adapt(end);
- adapt(caseFC);
- adapt(link);
- return pageflowChanged;
- }
-
- private boolean cleanPageflowNavigationRule(Pageflow pageflow) {
- boolean dirty = false;
- List links = pageflow.getLinks();
- Iterator linksIterator = links.iterator();
- while (linksIterator.hasNext()) {
- PageflowLink link = (PageflowLink) linksIterator.next();
- if (link.getFCElements().isEmpty()) {
- linksIterator.remove();
- if (link.getSource() != null) {
- link.getSource().getOutlinks().remove(link);
- }
- if (link.getTarget() != null) {
- link.getTarget().getInlinks().remove(link);
- }
- dirty = true;
- }
- }
- return dirty;
- }
-
- /**
- * merge the two navigation rules list between pageflow and face-config
- * file. merge rule: 1. if the from-view-id, from-action, and from-outcome
- * are same, they are the same navigation case, then the navigation case in
- * face-config file should be updated by one in the pageflow. 2. otherwise
- * the new navigation case should be created.
- *
- * FIXME: Not merge, only update page flow from faces-config.
- *
- * @param rulesFC -
- * navigation rules in faces-config.
- * @param navigationRulesInPageflow -
- * navigation rules in pageflow model.
- *
- * @return boolean - whether add a new rule or not.
- */
- private boolean updateNavigationRulesInPageflowFromFacesConfig(List rulesFC) {
- boolean isNew = false;
- // if the faces-config file is empty, the links should be removed.
- if (rulesFC == null || rulesFC.isEmpty()) {
- for (Iterator iterLink = pageflow.getLinks().iterator(); iterLink
- .hasNext();) {
- PageflowLink link = (PageflowLink) iterLink.next();
- link.getSource().getOutlinks().remove(link);
- link.getTarget().getInlinks().remove(link);
- }
- pageflow.getLinks().clear();
- } else {
- // Rule - Cases
- for (Iterator iterRulesFC = rulesFC.iterator(); iterRulesFC
- .hasNext();) {
- NavigationRuleType ruleFC = (NavigationRuleType) iterRulesFC
- .next();
-
- List casesFC = ruleFC.getNavigationCase();
- for (Iterator iterCasesFC = casesFC.iterator(); iterCasesFC
- .hasNext();) {
- NavigationCaseType navigationCaseFC = (NavigationCaseType) iterCasesFC
- .next();
- isNew |= updatePageflowElements(pageflow, navigationCaseFC);
- }
- }
- }
- isNew |= cleanPageflowNavigationRule(pageflow);
- return isNew;
- }
-
- /**
- * Find a pageflow link that is not linked to a faces-config element. Since
- * user might edit faces-config file with other editor, so the path is not
- * always valid, here we still try to match link and navigation case. TODO:
- * should we always resolve mapping from referenceLink on PageflowElement?
- */
- private PageflowLink findUnmappedLink(PageflowPage start, PageflowPage end,
- NavigationCaseType caseFC) {
- List links = start.getOutlinks();
- for (int i = 0, n = links.size(); i < n; i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- if (link.getSource() == start && link.getTarget() == end) {
- link.update();
- if (link.getFCElements().isEmpty()
- || link.getFCElements().getData().get(0) == caseFC) {
- return link;
- }
- }
- }
- return null;
- }
-
- public PageflowLink createPFLink(PageflowNode start, PageflowNode target,
- NavigationCaseType caseFC) {
- PageflowLink link = null;
- String fromOutcome = caseFC.getFromOutcome() != null ? caseFC
- .getFromOutcome().getTextContent() : null;
- String action = caseFC.getFromAction() != null ? caseFC.getFromAction()
- .getTextContent() : null;
- NavigationRuleType rule = (NavigationRuleType) caseFC.eContainer();
- link = createPFLink(fromOutcome);
- link.setFromaction(action);
- link.setSource(start);
- link.setTarget(target);
- start.getOutlinks().add(link);
- target.getInlinks().add(link);
- // The reference.
- link.getFCElements().add(caseFC);
- start.getFCElements().add(rule.getFromViewId());
- target.getFCElements().add(caseFC.getToViewId());
- return link;
- }
-
- /**
- * create a new PFLink object according to fromOutcome attribute
- *
- * @param fromOutcome -
- * PFLink's fromOutcome attribute
- * @return - new PFLink object
- */
- public PageflowLink createPFLink(String fromOutcome) {
- PageflowLink link = null;
- link = PageflowModelManager.getFactory().createPFLink();
- if (fromOutcome != null && fromOutcome.length() > 0) {
- link.setOutcome(fromOutcome.trim());
- }
- pageflow.getLinks().add(link);
- return link;
- }
-
- /**
- * create a new PFLink object according to fromOutcome attribute
- *
- * @param fromOutcome -
- * PFLink's fromOutcome attribute
- * @return - new PFLink object
- */
- public PageflowLink createPFLink(PageflowNode start, PageflowNode target,
- String action, String fromOutcome) {
- Assert.isTrue(start != null && target != null);
- PageflowLink link = null;
- link = createPFLink(fromOutcome);
- link.setFromaction(action);
- link.setSource(start);
- link.setTarget(target);
- start.getOutlinks().add(link);
- target.getInlinks().add(link);
- return link;
- }
-
- /**
- * Create a new PFPage according to from-view-id
- *
- * @param fromViewID -
- * page's from-view-id
- * @return
- */
- public PageflowPage createPFPage(String fromViewID) {
- PageflowPage page = PageflowFactory.eINSTANCE.createPFPage();
- if (fromViewID != null && fromViewID.length() > 0) {
- page.setPath(fromViewID.trim());
- page.setName(WebrootUtil.getPageNameFromWebPath(fromViewID.trim()));
- }
- this.pageflow.getNodes().add(page);
- return page;
- }
-
- /**
- * update pageflow model according to the face-config model
- *
- * @param pageflow -
- * pageflow model
- * @param facesConfig -
- * face-config model
- * @author sfshi
- */
- public boolean updatePageflowModelFromEMF() {
- if (pageflow != null && facesConfig != null) {
- List navigationRulesInFacesconfig = facesConfig.getNavigationRule();
- clearCaches();
- // if add new one, we can relayout the current pageflow.
- return updateNavigationRulesInPageflowFromFacesConfig(navigationRulesInFacesconfig);
- }
- return false;
- }
-
- void refreshLink(NavigationCaseType caseType) {
- PageflowLink link = getValidPFLinkInCache(caseType);
- if (link != null) {
- removeLink(link);
- }
- // update pageflow
- if (TransformUtil.isValidFacesConfigElement(caseType)) {
- updatePageflowElements(pageflow, caseType);
- }
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- switch (type) {
- case MY_NOTIFICATION_TYPE:
- setNeedBatchOperations(true);
- break;
- case MY_NOTIFICATION_TYPE1:
- setNeedBatchOperations(false);
- }
- }
-
- public boolean isListenToNotify() {
- return listenToNotify && !isInEvent;
- }
-
- public boolean isInEvent() {
- return isInEvent;
- }
-
- public void setInEvent(boolean isInEvent) {
- this.isInEvent = isInEvent;
- }
-
- public FacesConfigType getFacesConfig() {
- return facesConfig;
- }
-
- public Pageflow getPageflow() {
- return pageflow;
- }
-
- public static FromViewIdType createRLFromViewID(String value) {
- FromViewIdType fromView = FacesConfigFactory.eINSTANCE
- .createFromViewIdType();
- ((FromViewIdType) fromView).setTextContent(value);
- return fromView;
- }
-
- public static ToViewIdType createFCToViewID(String value) {
- ToViewIdType toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- toView.setTextContent(value);
- return toView;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java
deleted file mode 100644
index ba43042ba..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * The adapter that listens to modification of pageflow and updates faces-config
- * as needed.
- *
- * @author hmeng
- *
- */
-public class PF2FCSynchronizer extends AdapterImpl {
- FC2PFTransformer tranformer;
-
- private final boolean DEBUG = false;
-
- private static final Logger logger = EditorPlugin
- .getLogger(PF2FCSynchronizer.class);
-
- public PF2FCSynchronizer(FC2PFTransformer tranformer) {
- this.tranformer = tranformer;
- }
-
- public Notifier getTarget() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setTarget(Notifier newTarget) {
- // TODO Auto-generated method stub
-
- }
-
- public boolean isAdapterForType(Object type) {
- return type == PF2FCSynchronizer.class;
- }
-
- public void notifyChanged(Notification notification) {
- if (!isProcessorFor(notification)) {
- return;
- }
- tranformer.setInEvent(true);
- try {
- if (!(notification.getNotifier() instanceof PageflowElement)) {
- return;
- }
- processChange(notification);
- } catch (Exception e) {
- logger.error(e);
- } finally {
- if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
- tranformer.refreshPFAdapter(tranformer.getPageflow());
- tranformer.refreshFCAdapter(tranformer.getFacesConfig());
- }
- tranformer.setInEvent(false);
- }
- }
-
- private boolean isProcessorFor(Notification notification) {
- return tranformer.isListenToNotify();
- }
-
- private void processChange(Notification notification) {
- PageflowElement element;
- element = (PageflowElement) notification.getNotifier();
- int type = notification.getEventType();
- switch (type) {
- case Notification.ADD: {
- int featureId = notification.getFeatureID(PageflowPackage.class);
- switch (featureId) {
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- addOutLink(notification, element);
- break;
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- addInLink(notification, element);
- break;
- case PageflowPackage.PAGEFLOW:
- break;
- }
- if (!tranformer.isNeedBatchOperations()) {
- updateAndNotify(notification);
- }
- break;
- }
- case Notification.SET:
- if (notification.getNewValue() != null) {
- processSet(notification, element);
- updateAndNotify(notification);
- }
- break;
- case Notification.REMOVE:
- case Notification.REMOVE_MANY: {
- int featureId = notification.getFeatureID(PageflowPackage.class);
- switch (featureId) {
- case PageflowPackage.PF_PAGE:
- // removePage(notification, (PageflowPage) element);
- break;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- removeLink(notification, element);
- break;
- }
- if (!tranformer.isNeedBatchOperations()) {
- updateAndNotify(notification);
- }
- break;
- }
- }
- }
-
- private void processSet(Notification notification, PageflowElement element) {
- if (notification.getNewValue() != null) {
- int value = notification.getFeatureID(PageflowPackage.class);
- if (element instanceof PageflowPage) {
- setProperties(notification, element, value);
- } else if (element instanceof PageflowLink) {
- if (DEBUG)
- System.out.println("The link property is changed");
- setProperties(notification, element, value);
- }
- }
- }
-
- private void setProperties(Notification notification,
- PageflowElement element, int value) {
- if (notification.getFeature() == PageflowPackage.eINSTANCE
- .getPFLink_Source()) {
- if (notification.getNewValue() instanceof String) {
- tranformer.changePFLinkStart((PageflowLink) element,
- (String) notification.getNewValue());
- }
- } else if (notification.getFeature() == PageflowPackage.eINSTANCE
- .getPFLink_Target()) {
- if (notification.getNewValue() instanceof String) {
- tranformer.changePFLinkEnd((PageflowLink) element,
- (String) notification.getNewValue());
- }
- } else {
- element.getFCElements().set(
- (EStructuralFeature) notification.getFeature(),
- notification.getNewValue());
- }
- }
-
- private void addInLink(Notification notification, PageflowElement element) {
- Object value = notification.getNewValue();
- PageflowLink link = (PageflowLink) value;
- if (element instanceof PageflowPage) {
- PageflowNode source = link.getSource();
- if (source instanceof PageflowPage) {
- tranformer.addLink((PageflowPage) source,
- (PageflowPage) element, link);
- }
- }
-
- }
-
- private void addOutLink(Notification notification, PageflowElement element) {
- Object value = notification.getNewValue();
- // for outLink remove, only target is referenced.
- PageflowLink link = (PageflowLink) value;
- if (element instanceof PageflowPage) {
- PageflowNode target = link.getTarget();
- // page->page
- if (target instanceof PageflowPage) {
- tranformer.addLink((PageflowPage) element,
- (PageflowPage) target, link);
- }
- }
- }
-
- private void removeLink(Notification notification, PageflowElement element) {
- Object value = notification.getOldValue();
- PageflowLink link = (PageflowLink) value;
-
- if (!link.getFCElements().isEmpty()) {
- NavigationCaseType caseFC = (NavigationCaseType) link
- .getFCElements().getData().get(0);
- if (caseFC != null)
- tranformer.removeCase(caseFC);
- }
- link.update();
- }
-
- private void updateAndNotify(Notification notification) {
- tranformer.getPageflow().notifyModelChanged(
- new ENotificationImpl((InternalEObject) notification
- .getNotifier(), Notification.SET,
- PageflowPackage.PAGEFLOW, null, null));
- }
-
- public void dispose() {
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java
deleted file mode 100644
index 5b1c148c0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-
-/**
- * @author hmeng
- */
-
-public abstract class PFBatchAdapter extends AdapterImpl {
- private boolean needPostpone;
-
- AbstractGraphicalEditPart editPart;
-
- public boolean isNeedPostpone(Notification msg) {
- return needPostpone
- && !(msg.getEventType() == FC2PFTransformer.MY_NOTIFICATION_TYPE || msg
- .getEventType() == FC2PFTransformer.MY_NOTIFICATION_TYPE1);
- }
-
- public void setNeedPostpone(boolean needPostpone) {
- this.needPostpone = needPostpone;
- }
-
- public AbstractGraphicalEditPart getEditPart() {
- return editPart;
- }
-
- public void setEditPart(AbstractGraphicalEditPart editPart) {
- this.editPart = editPart;
- }
-
- final public void notifyChanged(Notification msg) {
- if (!isNeedPostpone(msg)) {
- doNotifyChanged(msg);
- }
- }
-
- abstract public void doNotifyChanged(Notification notification);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java
deleted file mode 100644
index 39b447bca..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromOutcomeType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * The util for pageflow and faces-config transforming
- *
- * @author hmeng
- */
-
-public class TransformUtil {
-
- /**
- * To see if the faces-config element is on a valid hirachy.
- */
- public static boolean isValidFacesConfigElement(EObject object) {
- EObject parent = EcoreUtil.getRootContainer(object);
- boolean result = parent instanceof FacesConfigType;
- return result;
- }
-
- /**
- * To see if the pageflow element is on a valid hirachy.
- */
- public static boolean isValidPageflowElement(EObject element) {
- EObject root = EcoreUtil.getRootContainer(element);
- boolean result = root instanceof Pageflow;
- return result;
- }
-
- public static boolean isValidLink(PageflowLink link) {
- return isValidPageflowElement(link) && link.getSource() != null
- && link.getTarget() != null;
- }
-
- public static String getFromViewID(NavigationRuleType rule) {
- String result = "*";
- if (rule.getFromViewId() != null) {
- result = rule.getFromViewId().getTextContent();
- }
- return result;
- }
-
- public static String getToViewID(NavigationCaseType navCase) {
- String result = "*";
- if (navCase.getToViewId() != null) {
- result = navCase.getToViewId().getTextContent();
- }
- return result;
- }
-
- public static PageflowPage findPage(String path, Pageflow pageflow) {
- List nodes = pageflow.getNodes();
- for (int i = 0; i < nodes.size(); i++) {
- if (nodes.get(i) instanceof PageflowPage) {
- if (path != null) {
- if (path.equals(((PageflowPage) nodes.get(i)).getPath())) {
- return (PageflowPage) nodes.get(i);
- }
- }
- }
- }
- return null;
- }
-
- public static PageflowNode findCaseEnd(PageflowPage action,
- FromOutcomeType outcome, Pageflow pageflow) {
- // TODO: find a case end in pageflow model
- List links = action.getOutlinks();
- for (int i = 0; i < links.size(); i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- String outcomeStr = "";
- if (outcome != null) {
- outcomeStr = outcome.getTextContent();
- }
- if (link.getOutcome().equals(outcomeStr)) {
- return link.getTarget();
- }
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java
deleted file mode 100644
index 50ae29c9a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-
-/**
- *
- * Utility class to add and remove edit part markers.
- *
- * FIXME: add the identification mechanism of the model and remove the
- * dependency on the PageflowElement
- *
- * @author Xiao-guang Zhang
- *
- *
- */
-public class EditPartMarkerUtil {
-
- /**
- * Removes all markers that were created using createMarker()
- *
- * @param model -
- * the emf model related with edit part
- */
- public static void removeAllMarkers(EObject model) throws CoreException {
- IResource resource = getResource(model);
-
- if (resource != null) {
- String markerTypes[] = { IMarker.PROBLEM, IMarker.TASK };
-
- for (int iMT = 0; iMT < markerTypes.length; iMT++) {
- IMarker[] markers = resource.findMarkers(markerTypes[iMT],
- false, IResource.DEPTH_ONE);
-
- for (int iMark = 0; iMark < markers.length; iMark++) {
- markers[iMark].delete();
- }
- }
- }
- }
-
- /**
- * Removes a specific problem marker type with the given severity.
- *
- * @param model -
- * the model related with this edit part.
- * @param sMarkerType -
- * the marker type, either IMarker.PROBLEM or IMarker.TASK
- * @param iSeverity -
- * severity/priority: if sMarkerType is IMarker.PROBLEM, then
- * this value is one of the PROBLEM severities; if sMarkerType is
- * IMarker.TASK, this is a task priority.
- * @throws CoreException
- * passed on from IResource.findMarkers()
- */
- public static void removeAllMarkers(EObject model, String sMarkerType,
- int iSeverity) throws CoreException {
- IResource resource = getResource(model);
-
- if (resource != null) {
- IMarker[] markers = resource.findMarkers(sMarkerType, false,
- IResource.DEPTH_ONE);
-
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- int iMarkerSeverity = marker.getAttribute(IMarker.SEVERITY,
- IMarker.SEVERITY_ERROR);
-
- if (iMarkerSeverity == iSeverity || iSeverity == -1) {
- markers[i].delete();
- }
- }
- }
- }
-
- /**
- * get the resouce according to part or model.
- *
- * @param part
- * @param model
- * @return
- */
- private static IResource getResource(EObject model) {
- IResource resource = null;
- resource = WebrootUtil.getResource(model);
- return resource;
- }
-
- /**
- * Create a problem marker.
- *
- * @param part -
- * the target editpart. It can be null, then the editpart will
- * not be updated.
- * @param model -
- * the model related with this edit part.
- * @param severity -
- * the problem severity, one of IMarker.SEVERITY_ERROR,
- * IMarker.SEVERITY_WARNING or IMarker.SEVERITY_INFO
- * @param message -
- * the text associated with this marker
- * @param location -
- * a unique ID that the application can use to locate the
- * editpart
- *
- * that corresponds to this marker; this is typically the DiagramElement's
- * ID string
- * @throws CoreException
- */
- public static void createMarker(EObject model, String sMarkerType,
- int severity, String message, String location) throws CoreException {
- IResource resource = getResource(model);
-
- if (resource != null) {
- IMarker marker = resource.createMarker(sMarkerType);
- marker.setAttribute(IMarker.MESSAGE, message);
- marker.setAttribute(IMarker.SEVERITY, severity);
- // The problem view doesn't show the location - only the line number
- // is shown in the "location" column. Doh!
- if (location != null && location.length() > 0) {
- marker.setAttribute(IMarker.LOCATION, location);
- }
- }
- }
-
- /**
- * Removes a specific problem marker type with the given severity.
- *
- * @param part -
- * the target editpart. It can be null, then the editpart will
- * not be updated.
- * @param model -
- * the model related with this edit part.
- * @param sMarkerType -
- * the marker type, either IMarker.PROBLEM or IMarker.TASK
- * @param iSeverity -
- * severity/priority: if sMarkerType is IMarker.PROBLEM, then
- * this value is one of the PROBLEM severities; if sMarkerType is
- * IMarker.TASK, this is a task priority.
- * @throws CoreException
- * passed on from IResource.findMarkers()
- */
- public static void removeMarker(EObject model, String sMarkerType)
- throws CoreException {
- IResource resource = getResource(model);
- if (resource != null) {
- IMarker[] markers = resource.findMarkers(sMarkerType, false,
- IResource.DEPTH_ONE);
-
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- // get the marker's location
- Object id = marker.getAttribute(IMarker.LOCATION);
-
- if (model instanceof PageflowElement) {
- if (((PageflowElement) model).getId().equals(id)) {
- markers[i].delete();
- }
- }
- }
- }
- }
-
- /**
- * Searches the hierarchy starting at the given EditPart for a given model
- * object ID string (the DiagramElement.ID value) and returns that EditPart
- *
- * @param containerPart
- * @param id
- * @return the EditPart that corresponds to the given ID string, or null if
- * not found
- */
- public static GraphicalEditPart findEditPart(
- GraphicalEditPart containerPart, String id) {
- Object model = containerPart.getModel();
- if (model instanceof PageflowElement) {
- String modelId = ((PageflowElement) model).getId();
- if (modelId != null && modelId.equals(id)) {
- return containerPart;
- }
- }
-
- Iterator iterNode = containerPart.getChildren().iterator();
- while (iterNode.hasNext()) {
- GraphicalEditPart child = (GraphicalEditPart) iterNode.next();
- GraphicalEditPart foundPart = findEditPart(child, id);
- if (foundPart != null) {
- return foundPart;
- }
- }
-
- Iterator iterConnection = containerPart.getSourceConnections()
- .iterator();
- while (iterConnection.hasNext()) {
- GraphicalEditPart child = (GraphicalEditPart) iterConnection.next();
- GraphicalEditPart foundPart = findEditPart(child, id);
- if (foundPart != null) {
- return foundPart;
- }
- }
-
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java
deleted file mode 100644
index 34c467f39..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-/**
- * This class is defined as a simple adapter to JSP DOM model. User can get the
- * taglib prefix, and get the needed element by element tage name, and
- * namespace(prefix) Usage: User should initialize this class instance before
- * using it. Following is a typical example: JSPDomAdapter jspAdapter = new
- * JSPDomAdapter(); IFile jspFile =
- * ResourcesPlugin.getWorkspace().getRoot().getFile(jspPath); if
- * (_jspAdapter.initialize(jspFile)) { //the prefix of JSF HTML TagLib String
- * prefix = _jspAdapter.getTagLibPrefix(JSPDomAdapter.JSF_HTML_TAGLIB); }
- *
- * @author Xiao-guang Zhang
- */
-public class JSPDomAdapter {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(JSPDomAdapter.class);
-
- /** JSP Taglib's tag name */
- public static String JSP_TAGLIB_TAG = "jsp:directive.taglib";
-
- /** JSF HTML TagLib name */
- public static String JSF_HTML_TAGLIB = "http://java.sun.com/jsf/html";
-
- /** singleton model manager */
- private static IModelManager modelManager;
-
- /** source jsp file */
- private IFile jspFile;
-
- /** Structured Model of JSP File */
- private IStructuredModel model;
-
- /** Root Document (Node) of JSP file */
- private Document document;
-
- /**
- *
- */
- public JSPDomAdapter() {
- super();
-
- }
-
- /**
- * initialize this adapter to get the StructuredModel for the input file.
- * At last user should call releaseModel() method to release the Structured Model.
- *
- * @param file -
- * JSP file
- * @return - True means sucessfully load jsp file.
- */
- public boolean initialize(IFile file) {
- jspFile = file;
-
- if (jspFile != null && jspFile.exists()) {
- try {
- model = getModel(jspFile);
- } catch (IOException e) {
- // PageFlow.JSPDomAdapter.FailToGetStructuredModel = Failed to
- // get the structured model
- log.error("PageFlow.JSPDomAdapter.FailToGetStructuredModel", e); //$NON-NLS-1$
- } catch (CoreException e) {
- // PageFlow.JSPDomAdapter.FailToGetStructuredModel = Failed to
- // get the structured model
- log.error("PageFlow.JSPDomAdapter.FailToGetStructuredModel", e);//$NON-NLS-1$
- }
-
- if (model != null && model instanceof IDOMModel) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * get the prefix for the input taglib URI, e.g.,
- * http://java.sun.com/jsf/html -> "h"
- *
- * @param taglibURI
- * @return
- */
- public String getTagLibPrefix(String taglibURI) {
- String prefix = null;
-
- if (getDocument() != null) {
- prefix = JSPUtil.getPrefix((IDOMModel) model, taglibURI);
- }
-
- return prefix;
- }
-
- /**
- * get the elements by the namespace and its tag name, e.g., h and
- * commandButton.
- *
- * @param namespace -
- * namespace for the taglib, e.g., h for
- * http://java.sun.com/jsf/html
- * @param elementName -
- * element Tag Name, e.g., h
- * @return - Element Node list.
- */
- public List getElementsByTagNameNS(String namespace, String elementName) {
- List nodes = null;
-
- if (getDocument() != null) {
- NodeList listNodes = null;
- if (namespace != null) {
- listNodes = getDocument().getElementsByTagName(
- namespace + ":" + elementName); //$NON-NLS-1$
- } else {
- listNodes = getDocument().getElementsByTagName(elementName); //$NON-NLS-1$
- }
-
- if (listNodes != null && listNodes.getLength() > 0) {
- nodes = new ArrayList();
- for (int i = 0; i < listNodes.getLength(); i++) {
- nodes.add(listNodes.item(i));
- }
- }
- }
- return nodes;
- }
-
- /**
- * get the singleton model manager.
- *
- * @return
- */
- private IModelManager getModelManager() {
- if (modelManager == null) {
- modelManager = StructuredModelManager.getModelManager();
- }
- return modelManager;
- }
-
- /**
- * get the structured model for the JSP file
- *
- * @param file -
- * JSP File
- * @return - IStructuredModel
- * @throws IOException
- * @throws CoreException
- */
- private IStructuredModel getModel(IFile file) throws IOException,
- CoreException {
- return getModelManager().getModelForRead(file);
- }
-
- /**
- * get the root docuement for the StructuredModel
- *
- * @return
- */
- private Document getDocument() {
- if (document == null) {
- if (model != null && model instanceof IDOMModel) {
- document = ((IDOMModel) model).getDocument();
- }
- }
- return document;
- }
-
-
- public void releaseModel() {
- if (model != null) {
- model.releaseFromRead();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
deleted file mode 100644
index 527e7c3f3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
- * utility class for JSP related information.
- *
- * @author Yang Liu
- */
-public class JSPUtil {
- /**
- * find out whether the specified taglib has been defined in the IDOMModel.
- * If found, then return the prefix. If can't find, then will try to add a
- * taglib declaration into the model, and try to use the specified default
- * prefix
- *
- * @param model
- * @param uri
- * @return
- */
- public static String getOrCreatePrefix(IDOMModel model, String uri,
- String defaultPrefix) {
- String prefix = getPrefix(model, uri);
- if (prefix != null)
- return prefix;
- String s = findUnusedPrefix(model, defaultPrefix);
-
- // TODO: should create the taglib inside the IDOMModel
- return s;
- }
-
- /**
- *
- * @param model
- * @param uri
- * @return null means this is tld is not declared in the jsp file
- */
- public static String getPrefix(IDOMModel model, String uri) {
- TLDCMDocumentManager m = TaglibController.getTLDCMDocumentManager(model
- .getStructuredDocument());
- if (m == null)
- return null;
- List trackers = m.getTaglibTrackers();
- for (Iterator iter = trackers.iterator(); iter.hasNext();) {
- TaglibTracker tracker = (TaglibTracker) iter.next();
- if (uri.equals(tracker.getURI())) {
- return tracker.getPrefix();
- } else {
- CMDocument cmdoc = tracker.getDocument();
- if (cmdoc instanceof TLDDocument
- && uri.equals(((TLDDocument) cmdoc).getUri())) {
- return tracker.getPrefix();
- }
- }
- }
- return null;
- }
-
- public static String findUnusedPrefix(IDOMModel model, String suggestion) {
- if (suggestion == null)
- suggestion = "p";
- TLDCMDocumentManager m = TaglibController.getTLDCMDocumentManager(model
- .getStructuredDocument());
- if (m == null)
- return suggestion;
- List trackers = m.getTaglibTrackers();
- Set map = new HashSet();
- for (Iterator iter = trackers.iterator(); iter.hasNext();) {
- TaglibTracker tracker = (TaglibTracker) iter.next();
- map.add(tracker.getPrefix());
- }
- if (!map.contains(suggestion))
- return suggestion;
- for (int i = 1;; i++) {
- if (!map.contains(suggestion + i))
- return suggestion + i;
- }
- }
-
- /**
- * given the prefix, find the corresponding jsp tld URI.
- *
- * @param model
- * @param prefix
- * @return
- */
- public static String findURIForPrefix(IDOMModel model, String prefix) {
- if (prefix == null || model == null)
- return null;
- TLDCMDocumentManager m = TaglibController.getTLDCMDocumentManager(model
- .getStructuredDocument());
- if (m == null)
- return null;
- List trackers = m.getTaglibTrackers();
- for (Iterator iter = trackers.iterator(); iter.hasNext();) {
- TaglibTracker tracker = (TaglibTracker) iter.next();
- if (prefix.equals(tracker.getPrefix())) {
- CMDocument cmdoc = tracker.getDocument();
- if (cmdoc instanceof TLDDocument) {
- return ((TLDDocument) cmdoc).getUri();
- } else
- return null;
- }
- }
- return null;
- }
-
- /**
- * get the action list in the jsp file
- *
- * @return - action list
- */
- public static List getActionListInJSPFile(String jspFileName) {
- /** jsp dom adapter */
- JSPDomAdapter jspAdapter;
-
- List actions = new ArrayList();
- jspAdapter = new JSPDomAdapter();
- // convert the relative directory to project directory, e.g., /a.jsp to
- // /testproject/webroot/a.sjp
- String physicalJspPath = jspFileName;
- if (physicalJspPath != null && physicalJspPath.length() > 0) {
- IPath jspPath = new Path(physicalJspPath);
- IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(
- jspPath);
-
- if (jspFile != null && jspFile.exists()) {
- // initialize the adapter to initialize the model of jsp
- if (jspAdapter.initialize(jspFile)) {
- // the prefix of JSF HTML TagLib
- String prefix = jspAdapter
- .getTagLibPrefix(JSPDomAdapter.JSF_HTML_TAGLIB);
-
- // get the command butonns
- List buttonActions = jspAdapter.getElementsByTagNameNS(
- prefix, "commandButton");//$NON-NLS-1$
- if (buttonActions != null) {
- actions.addAll(buttonActions);
- }
-
- // get the command links
- List linkActions = jspAdapter.getElementsByTagNameNS(
- prefix, "commandLink");//$NON-NLS-1$
- if (linkActions != null) {
- actions.addAll(linkActions);
- }
- }
- }
- }
- jspAdapter.releaseModel();
- return actions;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java
deleted file mode 100644
index 655b4c618..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-
-/**
- * This class implements the CreationFactory used by the CreationTool. It in
- * turn uses the EMF-generated factories to create the model instances
- *
- * @author Xiao-guang Zhang
- */
-public class ModelCreationFactory implements CreationFactory {
- private Class targetClass;
-
- public ModelCreationFactory(Class targetClass) {
- this.targetClass = targetClass;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.requests.CreationFactory#getNewObject()
- */
- public Object getNewObject() {
- PageflowFactory factory = PageflowModelManager.getFactory();
-
- Object result = null;
-
- if (targetClass.equals(PageflowLink.class)) {
- result = factory.createPFLink();
-
- } else if (targetClass.equals(PageflowPage.class)) {
- result = factory.createPFPage();
- }
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.requests.CreationFactory#getObjectType()
- */
- public Object getObjectType() {
- return targetClass;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java
deleted file mode 100644
index d2431d60c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It
- * provides an adapter <code>createXXX</code> method for each class of the
- * model. <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage
- * @generated
- */
-public class PageflowAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static PageflowPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PageflowAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = PageflowPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc --> This implementation returns <code>true</code>
- * if the object is either the model's package or is an instance object of
- * the model. <!-- end-user-doc -->
- *
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowSwitch modelSwitch = new PageflowSwitch() {
- public Object casePageflow(Pageflow object) {
- return createPageflowAdapter();
- }
-
- public Object casePageflowNode(PageflowNode object) {
- return createPageflowNodeAdapter();
- }
-
- public Object casePFLink(PageflowLink object) {
- return createPFLinkAdapter();
- }
-
- public Object casePageflowElement(PageflowElement object) {
- return createPageflowElementAdapter();
- }
-
- public Object casePFPage(PageflowPage object) {
- return createPFPageAdapter();
- }
-
- public Object casePFLinkBendpoint(PageflowLinkBendpoint object) {
- return createPFLinkBendpointAdapter();
- }
-
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @param target
- * the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter) modelSwitch.doSwitch((EObject) target);
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow
- * @generated
- */
- public Adapter createPageflowAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode <em>Node</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode
- * @generated
- */
- public Adapter createPageflowNodeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink <em>PF Link</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink
- * @generated
- */
- public Adapter createPFLinkAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement <em>Element</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement
- * @generated
- */
- public Adapter createPageflowElementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFAction <em>PF Action</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFAction
- * @generated
- */
- public Adapter createPFActionAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage <em>PF Page</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage
- * @generated
- */
- public Adapter createPFPageAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFBegin <em>PF Begin</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFBegin
- * @generated
- */
- public Adapter createPFBeginAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFEnd <em>PF End</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFEnd
- * @generated
- */
- public Adapter createPFEndAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint <em>PF Link Bendpoint</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint
- * @generated
- */
- public Adapter createPFLinkBendpointAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case. <!-- begin-user-doc --> This
- * default implementation returns null. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-}
-// PageflowAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java
deleted file mode 100644
index 89e6190fb..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.IAnnotationEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PFValidator;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * This class can be used to add annotation for the current pageflow model and
- * decoration for view.
- *
- * @author Xiao-guang Zhang
- *
- *
- */
-public class PageflowAnnotationUtil {
-
- /**
- *
- * validate the pageflow and its edit part
- *
- * @param containerPart -
- * it can be null, then the edit part will not be updated
- */
- public static void validatePageflow(GraphicalEditPart containerPart) {
- if (containerPart == null) {
- return;
- }
-
- // removeAllAnnotations(containerPart);
-
- // validate the nodes including page and actions.
- Iterator iterChild = containerPart.getChildren().iterator();
- while (iterChild.hasNext()) {
-
- PageflowElementEditPart element = (PageflowElementEditPart) iterChild
- .next();
- // String errorMessage = null;
- if (element instanceof PFValidator) {
- ((PFValidator) element).validate();
- }
- // if (element.getModel() instanceof PageflowPage) {
- // errorMessage = PageflowValidation.getInstance().getNotifyMessage(
- // (PageflowPage) element.getModel());
- // }
-
- // if (errorMessage != null) {
- // addAnnotation(element, errorMessage);
- // } else {
- // removeAnnotation(element);
- // }
-
- // validate the connections.
- Iterator iterLinks = element.getSourceConnections().iterator();
- while (iterLinks.hasNext()) {
- PageflowLinkEditPart link = (PageflowLinkEditPart) iterLinks
- .next();
- link.validate();
- // validateLink(link);
- }
- }
-
- }
-
- /**
- * validate the page based on model and its's edit part.
- *
- * @param pagePart -
- * it can be null, then the edit part will not be updated
- */
- public static void validatePage(PageflowNodeEditPart pagePart) {
- if (pagePart == null && pagePart.getParent() != null) {
- return;
- }
-
- String errorMessage = null;
-
- removeAnnotation(pagePart);
-
- errorMessage = PageflowValidation.getInstance().getNotifyMessage(
- (PageflowPage) pagePart.getModel());
-
- if (errorMessage != null) {
- addAnnotation(pagePart, errorMessage);
- } else {
- removeAnnotation(pagePart);
- }
-
- // validate the connections.
- // Iterator iterLinks = pagePart.getSourceConnections().iterator();
- // while (iterLinks.hasNext()) {
- // PageflowLinkEditPart link = (PageflowLinkEditPart) iterLinks.next();
- //
- // validateLink(link);
- // }
- }
-
- /**
- * validate the link based on model and its's edit part.
- *
- * @param linkPart -
- * it can be null, then the edit part will not be updated
- */
- public static void validateLink(PageflowLinkEditPart linkPart) {
- if (linkPart != null && linkPart.getParent() != null) {
- String errorMessage = null;
-
- removeAnnotation(linkPart);
-
- errorMessage = PageflowValidation.getInstance().isValidLink(
- (PageflowLink) linkPart.getModel());
-
- if (errorMessage != null) {
- addAnnotation(linkPart, errorMessage);
- } else {
- removeAnnotation(linkPart);
- }
- }
- }
-
- /**
- * add a marker with IMarker.PROBLEM type, IMarker.SEVERITY_ERROR severity,
- * and message.
- *
- * @param editPart
- * @param model
- * @param message
- */
- private static void addAnnotation(GraphicalEditPart editPart, String message) {
- if (editPart != null && editPart instanceof IAnnotationEditPart) {
- Annotation annotation = new Annotation(IMarker.PROBLEM, false,
- message);
- ((IAnnotationEditPart) editPart).addAnnotation(annotation);
- }
- }
-
- /**
- * remove a marker
- *
- * @param editPart
- * @param model
- */
- private static void removeAnnotation(GraphicalEditPart editPart) {
- if (editPart != null && editPart instanceof IAnnotationEditPart) {
- ((IAnnotationEditPart) editPart).removeAnnotation();
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java
deleted file mode 100644
index 9c741265e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-
-/**
- * Drives the model. Acts as the model entry point, including create, load, save
- * operations.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowModelManager {
- /**
- * In EMF, a resource provides the way to have access to the model content.
- */
- private Resource resourcePageflow = null;
-
- /**
- * the path of current pageflow model resource provides the way to have
- * access to the model content.
- */
- private IPath pathPageflow = null;
-
- /**
- * Contains the factory associated with the model.
- */
- private static PageflowFactory pageflowFactory = null;
-
- /**
- * Gives access to the top level pageflow contained in the resource.
- */
- private Pageflow pageflow = null;
-
- /**
- * resource set
- */
- private ResourceSet resourceSet = null;
-
- /** unicode encoding UTF-8 support */
- private static HashMap defaultSaveOptions = new HashMap();
-
- static {
- defaultSaveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
- }
-
- /**
- * Returns the resource containing the pageflow. Uses lazy initialization.
- *
- * @param path -
- * pageflow file name
- * @return
- */
- public Resource getResource(IPath path) {
- if (resourcePageflow == null) {
- pathPageflow = path;
- ResourceSet resSet = getResourceSet();
- resourcePageflow = resSet.getResource(URI.createFileURI(path
- .toString()), true);
- }
-
- return resourcePageflow;
- }
-
- /**
- * Gets the top level pageflow model.
- *
- * @return
- */
- public Pageflow getModel() {
- if (null == pageflow) {
- EList l = resourcePageflow.getContents();
- Iterator i = l.iterator();
- while (i.hasNext()) {
- Object o = i.next();
- if (o instanceof Pageflow) {
- pageflow = (Pageflow) o;
- }
- }
- }
- return pageflow;
- }
-
- /**
- * Creates a resource to contain the network. The resource file does not
- * exist yet.
- *
- * @param path
- * @return
- */
- private Resource createResource(IPath path) {
- if (resourcePageflow == null) {
- pathPageflow = path;
- ResourceSet resSet = getResourceSet();
- resourcePageflow = resSet.createResource(URI.createFileURI(path
- .toString()));
- }
- return resourcePageflow;
- }
-
- /**
- * Returns the resource set.
- *
- * @param
- * @return
- */
- private ResourceSet getResourceSet() {
- if (null == resourceSet) {
- // Initialize the pageflow package, this line can not be removed.
- PageflowPackageImpl.init();
- // Register the XML resource factory for the .pageflow extension
- Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
- Map regMap = reg.getExtensionToFactoryMap();
- // m.put("pageflow", new XMIResourceFactoryImpl());
- regMap.put("pageflow", new PageflowResourceFactoryImpl());
-
- resourceSet = new ResourceSetImpl();
- }
-
- return resourceSet;
- }
-
- /**
- * Returns the factory associated with the model. Object creation are made
- * through that factory.
- *
- * @return - pageflow factory
- */
- static public PageflowFactory getFactory() {
- if (pageflowFactory == null) {
- // Access the factory (needed to create instances)
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage pageflowPackage = (PageflowPackage) registry
- .get(pageflowURI);
- pageflowFactory = pageflowPackage.getPageflowFactory();
- }
- return pageflowFactory;
- }
-
- /**
- * Creates a new pageflow model with begin and end nodes.
- *
- * @param path -
- * the new pageflow file name
- * @return - new pageflow model
- */
- public Pageflow createPageflow(IPath path) {
- createResource(path);
- // Create a new pageflow model
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage nPackage = (PageflowPackage) registry.get(pageflowURI);
- PageflowFactory nFactory = nPackage.getPageflowFactory();
- pageflow = nFactory.createPageflow();
-
- resourcePageflow.getContents().add(pageflow);
- return pageflow;
- }
-
- /**
- * Loads the content of the model from the file.
- *
- * @param path
- */
- public void load(IPath path) throws IOException {
- getResource(path);
- }
-
- /**
- * reloads the content of the model from the file.
- *
- * @param path
- */
- public void reload(IPath path) throws IOException {
- getResource(path).unload();
- load(path);
- }
-
- /**
- * Saves the content of the model to the file.
- *
- * @param path
- */
- public void save(final IPath path) throws IOException {
- if (!pathPageflow.toString().equalsIgnoreCase(path.toString())) {
- pathPageflow = path;
- URI fileURI = URI.createPlatformResourceURI(path.toString());
- resourcePageflow.setURI(fileURI);
- }
- resourcePageflow.save(defaultSaveOptions);
- }
-
- /**
- * get the file path of current pageflow resource
- *
- * @return - the file path
- */
- public IPath getPath() {
- return pathPageflow;
- }
-
- /**
- * found page node according the web path.
- *
- * @param webPath
- * @return
- */
- public PageflowPage foundPage(String webPath) {
- PageflowPage page = null;
-
- if (getModel() != null) {
- Iterator iterNodes = getModel().getNodes().iterator();
- while (iterNodes.hasNext()) {
- PageflowNode node = (PageflowNode) iterNodes.next();
- if (node instanceof PageflowPage) {
- if (((PageflowPage) node).getPath().equalsIgnoreCase(webPath)) {
- page = (PageflowPage) node;
- break;
- }
- }
- }
- }
-
- return page;
- }
-
- /**
- *
- * Build a path for the resource in the .metadata directory given the path
- * of the model resource. For example, given a model resource path of
- * \test\folder\filename.ext the resulting Pageflow path name will be
- * \test\.metadata\folder\filename.pageflow
- *
- * @param pathFacesConfig -
- * faces-config file path.
- *
- * @return
- */
- public static IPath makePageflowPath(IPath pathFacesConfig) {
- IPath pageflowPath;
- String[] segs = pathFacesConfig.removeFileExtension().segments();
- pageflowPath = new Path(segs[0]).makeAbsolute();
- pageflowPath = pageflowPath.append(".metadata");
- for (int i = 1; i < segs.length; i++) {
- pageflowPath = pageflowPath.append(segs[i]);
- }
- // pageflowPath.removeFileExtension();
- pageflowPath = pageflowPath.addFileExtension("pageflow");
- return pageflowPath;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java
deleted file mode 100644
index 8505a58ae..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-
-/**
- *
- * This is the Page Flow Resource Factory for resource drag and drop
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowResourceFactory implements CreationFactory {
- /** resource */
- private IResource resource;
-
- public PageflowResourceFactory(IResource resource) {
- this.resource = resource;
- }
-
- /*
- * (non-javadoc)
- *
- * @see Factory#getNewObject()
- */
- public Object getNewObject() {
- if (null == resource) {
- return null;
- }
-
- String strWebPath = WebrootUtil.getWebPath(resource.getFullPath());
- if (strWebPath.length() > 0) {
- PageflowFactory factory = PageflowModelManager.getFactory();
- Object result = factory.createPFPage();
- PageflowPage page = (PageflowPage) result;
- page.setPath(strWebPath);
- page.setName(WebrootUtil.getPageNameFromWebPath(strWebPath));
- return page;
- } else {
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.Error.DNDResourceTitle",
- EditorPlugin
- .getResourceString("Pageflow.Error.InvalidResource")
- + resource.getName());
- }
-
- return null;
- }
-
- /*
- * (non-javadoc)
- *
- * @see Factory#getObjectType()
- */
- public Object getObjectType() {
- return resource;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java
deleted file mode 100644
index 1181474f8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-
-/**
- * The <b>Resource Factory</b> associated with the package.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowResourceFactoryImpl extends XMLResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
- */
- public PageflowResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- */
- public Resource createResource(URI uri) {
- Resource result = new PageflowResourceImpl(uri);
- return result;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java
deleted file mode 100644
index 07e13ee12..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- *
- * The <b>Resource </b> associated with the package.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @param uri
- * the URI of the new resource.
- * @generated
- */
- public PageflowResourceImpl(URI uri) {
- super(uri);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java
deleted file mode 100644
index f4df38b8c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch doSwitch(object)} to invoke
- * the <code>caseXXX</code> method for each class of the model, starting with
- * the actual class of the object and proceeding up the inheritance hierarchy
- * until a non-null result is returned, which is the result of the switch. <!--
- * end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage
- * @generated
- */
-public class PageflowSwitch {
- /**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static PageflowPackage modelPackage;
-
- /**
- * Creates an instance of the switch. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PageflowSwitch() {
- if (modelPackage == null) {
- modelPackage = PageflowPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one
- * returns a non null result; it yields that result. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * @generated
- */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one
- * returns a non null result; it yields that result. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * @generated
- */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- } else {
- List eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(
- (EClass) eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one
- * returns a non null result; it yields that result. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case PageflowPackage.PAGEFLOW: {
- Pageflow pageflow = (Pageflow) theEObject;
- Object result = casePageflow(pageflow);
- if (result == null)
- result = casePageflowElement(pageflow);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case PageflowPackage.PF_LINK: {
- PageflowLink pfLink = (PageflowLink) theEObject;
- Object result = casePFLink(pfLink);
- if (result == null)
- result = casePageflowElement(pfLink);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
-
- case PageflowPackage.PF_PAGE: {
- PageflowPage pfPage = (PageflowPage) theEObject;
- Object result = casePFPage(pfPage);
- if (result == null)
- result = casePageflowNode(pfPage);
- if (result == null)
- result = casePageflowElement(pfPage);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
-
- case PageflowPackage.PF_LINK_BENDPOINT: {
- PageflowLinkBendpoint pfLinkBendpoint = (PageflowLinkBendpoint) theEObject;
- Object result = casePFLinkBendpoint(pfLinkBendpoint);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- default:
- return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Pageflow</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Pageflow</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePageflow(Pageflow object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Node</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePageflowNode(PageflowNode object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>PF Link</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>PF Link</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePFLink(PageflowLink object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePageflowElement(PageflowElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>PF Page</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>PF Page</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePFPage(PageflowPage object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>PF Link Bendpoint</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>PF Link Bendpoint</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePFLinkBendpoint(PageflowLinkBendpoint object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch, but this is the last case
- * anyway. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-}
-// PageflowSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java
deleted file mode 100644
index 6a1011a78..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * The tranform between pageflow and navigation rules in faces-config file.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowTransform {
-
- /** The shared singleton instance. */
- private static PageflowTransform transform;
-
- private PageflowTransform() {
- // private contructor
- }
-
- /**
- * Returns the shared singleton instance.
- */
- public static PageflowTransform getInstance() {
- if (transform == null) {
- transform = new PageflowTransform();
- }
- return transform;
- }
-
- /**
- * Update source PFPage with Faces-config model.
- *
- * @param sourcePage
- * @param navigationRuleFC
- * @author sfshi
- */
- public void updatePageflowSourcePage(PageflowPage sourcePage,
- NavigationRuleType navigationRuleFC) {
- // set the descriiption of link
- if (navigationRuleFC.getDescription() != null
- && navigationRuleFC.getDescription().size() > 0) {
- String description = ((DescriptionType) navigationRuleFC
- .getDescription().get(0)).getTextContent();
- sourcePage.setComment(description);
- }
- // set the display-name of link
- if (navigationRuleFC.getDisplayName() != null
- && navigationRuleFC.getDisplayName().size() > 0) {
- String displayName = ((DisplayNameType) navigationRuleFC
- .getDisplayName().get(0)).getTextContent();
- sourcePage.setName(displayName);
- }
-
- // Set the icon of link
- if (navigationRuleFC.getIcon() != null
- && navigationRuleFC.getIcon().size() > 0) {
- boolean largeUpdated = false;
- boolean smallUpdated = false;
- for (int i = 0; i < navigationRuleFC.getIcon().size(); i++) {
- IconType icon = (IconType) navigationRuleFC.getIcon().get(i);
- if (!largeUpdated && icon.getLargeIcon() != null) {
- sourcePage.setLargeicon(icon.getLargeIcon()
- .getTextContent());
- largeUpdated = true;
- }
-
- if (!smallUpdated && icon.getSmallIcon() != null) {
- sourcePage.setSmallicon(icon.getSmallIcon()
- .getTextContent());
- smallUpdated = true;
- }
- if (largeUpdated && smallUpdated) {
- return;
- }
- }
- }
- }
-
- /**
- * Update target PFPage with Faces-config model.
- *
- * @param targetPage
- * @param navigationCaseFC
- * @author sfshi
- */
- public void updatePageflowTargetPage(PageflowPage targetPage,
- NavigationCaseType navigationCaseFC) {
- // set the descriiption of link
- if (navigationCaseFC.getDescription() != null
- && navigationCaseFC.getDescription().size() > 0) {
- String description = ((DescriptionType) navigationCaseFC
- .getDescription().get(0)).getTextContent();
- targetPage.setComment(description);
- }
- // set the display-name of link
- if (navigationCaseFC.getDisplayName() != null
- && navigationCaseFC.getDisplayName().size() > 0) {
- String displayName = ((DisplayNameType) navigationCaseFC
- .getDisplayName().get(0)).getTextContent();
- targetPage.setName(displayName);
- }
-
- // Set the icon of link
- if (navigationCaseFC.getIcon() != null
- && navigationCaseFC.getIcon().size() > 0) {
- boolean largeUpdated = false;
- boolean smallUpdated = false;
- for (int i = 0; i < navigationCaseFC.getIcon().size(); i++) {
- IconType icon = (IconType) navigationCaseFC.getIcon().get(0);
- if (!largeUpdated && icon.getLargeIcon() != null) {
- targetPage.setLargeicon(icon.getLargeIcon()
- .getTextContent());
- largeUpdated = true;
- }
-
- if (!smallUpdated && icon.getSmallIcon() != null) {
- targetPage.setSmallicon(icon.getSmallIcon()
- .getTextContent());
- smallUpdated = true;
- }
- if (largeUpdated && smallUpdated) {
- return;
- }
- }
- }
- }
-
- /**
- * update the pageflow model 's information, including pageflow's name,
- * description and related config file
- *
- * @param newPageflow
- * @param oldPageflow
- */
- public static void updatePageflowModelInfo(Pageflow newPageflow,
- Pageflow oldPageflow) {
- if (newPageflow == null || oldPageflow == null) {
- return;
- }
- newPageflow.setName(oldPageflow.getName());
- newPageflow.setComment(oldPageflow.getComment());
- newPageflow.setConfigfile(oldPageflow.getConfigfile());
-
- }
-}
-// PageflowTransform
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java
deleted file mode 100644
index f7ef91a84..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Pageflow's validation functions
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowValidation {
- /** PageflowValidation singleton instance */
- private static PageflowValidation instance;
-
- /** constructor */
- private PageflowValidation() {
-
- }
-
- /**
- * get the singleton instance of pageflow validation
- *
- * @return
- */
- public static PageflowValidation getInstance() {
- if (instance == null) {
- instance = new PageflowValidation();
- }
- return instance;
- }
-
- /**
- * check whether the source and target pageflow node are allowed to create a
- * new link NOT allowed source and target: 1. target node is Begin or source
- * node is End 2. both of source and target node are Action. 3. double
- * connection from the same source to target
- *
- * @param source -
- * source pageflow node
- * @param target -
- * target pageflow node
- * @return - is valid link or not.
- *
- */
- public boolean isValidLinkForCreation(PageflowNode source,
- PageflowNode target) {
- // Source and target must be pointing to some real pageflow node
- if (source == null || target == null) {
- return false;
- }
- return true;
- }
-
- /**
- * determine the pflink is valid or not for property souce. in our model,
- * there are five types of invalid pflinke for property source. 1. link
- * between page and action 2. the source of link is Begin or End node 3. the
- * target of link is Begin or End node.
- *
- * @return - valid link or not.
- *
- */
- public boolean isValidLinkForProperty(PageflowLink link) {
- return true;
- }
-
- /**
- * determine the pflink is valid or not for face-config rule in our model,
- * there are four types of invalid pflinke. 1. the source of link is Begin
- * or End node 2. the target of link is Begin or End node.
- *
- * @return - valid link or not.
- *
- */
- public boolean isValidLinkForNavigationRule(PageflowLink link) {
- return true;
- }
-
- /**
- * determine the pflink is valid or not for face-config rule in our model,
- * there are four types of invalid pflinke.
- *
- * @return - valid link or not.
- *
- */
- public String isValidLink(PageflowLink link) {
- String errorMessage = null;
- // action-page style
- // TODO: it should guarantee that outcome should be defined in the
- // managed bean's method.
-
- if (link.getSource() instanceof PageflowPage
- && link.getTarget() instanceof PageflowPage) {
- String outcome = link.getOutcome();
- if (outcome != null && outcome.length() >= 0) {
- // if (isValidServiceOutcome(outcome))
- // {
- // return errorMessage;
- // }
- String webPath = ((PageflowPage) link.getSource()).getPath();
- if (webPath != null) {
- String projectPath = WebrootUtil.getProjectPath(link,
- webPath);
-
- Path resourcePath = new Path(projectPath);
- IWorkspaceRoot workspaceRoot = ResourcesPlugin
- .getWorkspace().getRoot();
- final IResource resource = workspaceRoot
- .findMember(resourcePath);
-
- if (resource == null || !resource.exists()) {
- // Pageflow.Validation.NotExistedSourcePage = The source
- // page {0} is not existed.
- errorMessage = NLS
- .bind(
- PageflowMessages.Pageflow_Validation_UndefinedOutcome,
- outcome, webPath);
- }
- } else {
- // Pageflow.Validation.MissingSourcePage = The source page
- // should be specified.
- errorMessage = PageflowMessages.Pageflow_Validation_MissingSourcePage;
- }
- }
- }
- return errorMessage;
- }
-
- /**
- * Check whether the page is already existed in the pageflow.
- *
- * @param pageflow
- * @param page
- * @return
- */
- public boolean isExistedPage(Pageflow pageflow, PageflowPage page) {
- if (pageflow == null || page == null || page.getPath() == null) {
- return false;
- }
-
- return isExistedPage(pageflow, page.getPath());
- }
-
- /**
- * Check whether the page is already existed in the pageflow.
- *
- * @param pageflow
- * @param pagePath
- * @return
- */
- public boolean isExistedPage(Pageflow pageflow, String pagePath) {
- if (pageflow == null || pagePath == null) {
- return false;
- }
-
- Iterator iter = pageflow.getNodes().iterator();
-
- while (iter.hasNext()) {
- PageflowNode existedNode = (PageflowNode) iter.next();
-
- if (existedNode instanceof PageflowPage) {
- if (((PageflowPage) existedNode).getPath() != null
- && ((PageflowPage) existedNode).getPath()
- .equalsIgnoreCase(pagePath)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Check whether the page is valid or not validate page is : 1. if the page
- * is general jsp page, it should physically existed. 2. if the page is in
- * the form of /foldername/* (it contains the folder), the folder should be
- * existed.
- *
- * @param element
- * @return
- */
- public String getNotifyMessage(PageflowPage page) {
- String errorMessage = null;
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- String pagePath = page.getPath();
-
- // Check the path is empty or not
- if (pagePath != null && pagePath.length() > 0) {
- String resourceName = WebrootUtil.getProjectPath(page, pagePath);
- Path resourcePath = new Path(resourceName);
-
- final IResource resource = workspaceRoot.findMember(resourcePath);
-
- if (resource != null && resource.exists()) {
- // This page is related with jsp file
- if (resourcePath.getFileExtension() != null) {
- if (!WebrootUtil.isValidWebFile(resourcePath)) {
- // Pageflow.Validation.InvalidWebPage = the file {0} is
- // not valid web file.
- errorMessage = NLS
- .bind(
- PageflowMessages.Pageflow_Validation_InvalidWebPage,
- pagePath);
- }
- }
- } else {
- // Pageflow.Validation.NotExitedWebPage = the web page {0} is
- // not existed.
- errorMessage = NLS.bind(
- PageflowMessages.Pageflow_Validation_NotExitedWebPage,
- pagePath);
- }
- } else {
- // Pageflow.Validation.MissingWebPage = the web page's path should
- // be specified.
- errorMessage = PageflowMessages.Pageflow_Validation_MissingWebPage;
- }
- return errorMessage;
- }
-
- /**
- * check that the action is valid EL or not,
- *
- * @param actionEL -
- * action string, it should be in the form of #{...}
- * @return - True or False
- */
- public static boolean isValidActionEL(String actionEL) {
- if (actionEL != null && actionEL.length() > 3) {
- // action is defined in JSF expression language, e.g,
- // #{beanname.methodname}
- if (actionEL.substring(0, 2).equalsIgnoreCase("#{")//$NON-NLS-1$
- && actionEL.substring(actionEL.length() - 1,
- actionEL.length()).equalsIgnoreCase("}"))//$NON-NLS-1$
- {
- // Check the bean is existed or not.
- return true;
- }
-
- }
- return false;
- }
-
- /**
- * get the managed bean from action's expression, e.g., beanName.methodName.
- * The return will be beanName.
- *
- * @param actionEL
- * @return
- */
- public static String getManagedBeanforAction(String actionEL) {
- String managedBeanName = null;
- if (isValidActionEL(actionEL)) {
- actionEL = actionEL.substring(2, actionEL.length() - 1);
- String[] actionParts = actionEL.split("[.]");
- managedBeanName = actionParts[0];//$NON-NLS-1$
- }
-
- return managedBeanName;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java
deleted file mode 100644
index 1ce520378..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.Label; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.RotatableDecoration; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.draw2d.geometry.Transform; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; public class BaseFigureDecorator extends Label implements RotatableDecoration { public static int DEFAULT_DECORATOR_POSITION = PositionConstants.SOUTH_WEST; private Point location = new Point(); private Transform transform = new Transform(); private int position; public BaseFigureDecorator(Image image) { this.position = DEFAULT_DECORATOR_POSITION; setIcon(image); setSize(getPreferredSize()); } public BaseFigureDecorator(Image image, String tooltip) { this.position = DEFAULT_DECORATOR_POSITION; setIcon(image); setSize(getPreferredSize()); setToolTip(new Label(tooltip)); } public BaseFigureDecorator(Image image, String tooltip, int position) { this.position = position; setIcon(image); setSize(getPreferredSize()); setToolTip(new Label(tooltip)); } public Font getFont() { if (font == null) font = JFaceResources.getFontRegistry().get( JFaceResources.DEFAULT_FONT); return font; } /** * * @return Returns the position. * */ public int getPosition() { return position; } /** * * @param position * * The position to set. * */ public void setPosition(int position) { this.position = position; } public void setToolTipText(String tooltip) { super.setToolTip(new Label(tooltip)); } public String getToolTipText() { Label label = (Label) super.getToolTip(); return label.getText(); } /** * * Sets the location of this PolygonDecoration. * * * * @param p * * the new location * */ public void setLocation(Point p) { bounds = null; location.setLocation(p); transform.setTranslation(p.x, p.y); } public Rectangle getBounds() { if (bounds == null) { if (prefSize == null) getPreferredSize(); int w = prefSize.width; int h = prefSize.height; Point p = location; // transform.getTransformed(new Point(w/2,h/2)); bounds = new Rectangle(p.x - w / 2, p.y - h / 2, w, h).getExpanded( w, h); } return bounds; } /** * * @see Figure#useLocalCoordinates() * */ protected boolean useLocalCoordinates() { return false; } public void setScale(double x, double y) { // TODO: figure out how to scale images bounds = null; transform.setScale(x, y); } /** * * Sets the rotation of this decoration so that the decoration points toward * the * * given reference point. * * @param ref * the reference point * * @see org.eclipse.draw2d.RotatableDecoration#setReferencePoint(org.eclipse.draw2d.geometry.Point) * */ public void setReferencePoint(Point ref) { // TODO: figure out how to rotate images bounds = null; Point pt = Point.SINGLETON; pt.setLocation(ref); pt.negate().translate(location); setRotation(Math.atan2(pt.y, pt.x)); } /** * * Sets the angle by which rotation is to be done on the PolygonDecoration. * * * * @param angle * Angle of rotation * * @since 2.0 * */ public void setRotation(double angle) { bounds = null; // transform.setRotation(angle); } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java
deleted file mode 100644
index f316de2d7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java
+++ /dev/null
@@ -1,924 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * The <code>BaseNodeFigure</code> class is the base class for all the figures
- * representing DiagramNodes, ie those that can have ports with maxConnections
- * to other nodes.
- *
- * Assumes that all NodeFigures have some number of input and output ports
- *
- * @author ddean
- *
- */
-public class BaseNodeFigure extends Figure implements IBaseFigure {
- protected IBaseFigure baseFigure;
-
- protected boolean anchorsVisible = true;
-
- protected Hashtable connectionAnchors = new Hashtable(7);
-
- protected Vector inputConnectionAnchors = new Vector(2, 2);
-
- protected Vector outputConnectionAnchors = new Vector(2, 2);
-
- protected Vector topConnectionAnchors = new Vector();
-
- protected Vector bottomConnectionAnchors = new Vector();
-
- protected Vector leftConnectionAnchors = new Vector();
-
- protected Vector rightConnectionAnchors = new Vector();
-
- public BaseNodeFigure(IBaseFigure figure) {
- setBaseFigure(figure);
- ObserveVisibleXYLayout layout = new ObserveVisibleXYLayout();
- layout.setObserveVisibility(true);
- setLayoutManager(layout);
- }
-
- public void setBaseFigure(IBaseFigure figure) {
- setBaseFigure(figure, new Rectangle(0, 0, -1, -1));
- }
-
- public void setHighlight(boolean flag) {
- if (baseFigure != null) {
- moveToTop(this, baseFigure);
- baseFigure.setHighlight(flag);
- }
- }
-
- public void setBaseFigure(IBaseFigure figure, Rectangle constraint) {
- if (!getChildren().contains(figure)) {
- if (getChildren().contains(baseFigure))
- remove(baseFigure);
-
- baseFigure = figure;
- if (!getChildren().contains(baseFigure)) {
- // CR389070: Figures are abbreviating rule figures names and
- // making them unreadable
- if (getParent() != null
- && getParent().getLayoutManager() != null) {
- Rectangle r = getBounds().getCopy();
- r.width = -1;
- r.height = -1;
- getParent().getLayoutManager().setConstraint(this, r);
- }
- // CR389495: Working with nested complex activities causes in
- // the BP editor causes lockup
- // ensure that constraints are set on figure before add() - this
- // will cause a layout()
- this.add(baseFigure, constraint, 0);
- }
- }
- }
-
- public IBaseFigure getBaseFigure() {
- return baseFigure;
- }
-
- /***************************************************************************
- * Input/Output Ports
- **************************************************************************/
-
- /**
- * Add an input port and its anchor
- *
- * @param portName
- * unique name to refer to the port
- */
- public void addInput(String portName) {
- InputPortFigure inputPort = new InputPortFigure();
- add(inputPort);
- inputPort.setToolTipText(portName);
-
- PortConnectionAnchor anchor = new PortConnectionAnchor(inputPort);
- getTargetConnectionAnchors().add(anchor);
- connectionAnchors.put(portName, anchor);
- }
-
- /**
- * Add an output port and its anchor
- *
- * @param portName
- * unique name to refer to the port
- */
- public PortConnectionAnchor addOutput(String portName) {
- OutputPortFigure outputPort = new OutputPortFigure();
- add(outputPort);
- outputPort.setToolTipText(portName);
-
- PortConnectionAnchor anchor = new PortConnectionAnchor(outputPort);
- getSourceConnectionAnchors().add(anchor);
- connectionAnchors.put(portName, anchor);
- return anchor;
- }
-
- /**
- * Searches for and returns the anchor on this figure that is closest to the
- * reference point <code>p</code>
- *
- * @param p
- * the reference point
- * @return the anchor on this figure that is closest to <code>p</code>
- */
- public ConnectionAnchor connectionAnchorAt(Point p) {
- ConnectionAnchor closest = null;
- long min = Long.MAX_VALUE;
-
- Enumeration e = getSourceConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- e = getTargetConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- return closest;
- }
-
- /**
- * returns an anchor given its name
- *
- * @param portName
- * name of the anchor
- * @return the anchor with the name <code>portName</code>
- */
- public ConnectionAnchor getConnectionAnchor(String portName) {
- return (ConnectionAnchor) connectionAnchors.get(portName);
- }
-
- /**
- * returns the name of the specified anchor
- *
- * @param c
- * the anchor whose name is requested
- * @return the name of the specifed anchor
- */
- public String getConnectionAnchorName(ConnectionAnchor c) {
- Enumeration enumer = connectionAnchors.keys();
- String key;
- while (enumer.hasMoreElements()) {
- key = (String) enumer.nextElement();
- if (connectionAnchors.get(key).equals(c))
- return key;
- }
- return null;
- }
-
- /**
- * returns the source connection anchor that is closest to the reference
- * point
- *
- * @param p
- * the reference point
- * @return the closest connection anchor to <code>p</code>
- */
- public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
- ConnectionAnchor closest = null;
- long min = Long.MAX_VALUE;
-
- Enumeration e = getSourceConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- return closest;
- }
-
- /**
- * returns all the source connection anchors on this node figure
- *
- * @return a vector of all the source connection anchors for this figure
- */
- public Vector getSourceConnectionAnchors() {
- return outputConnectionAnchors;
- }
-
- /**
- * returns the target connection anchor that is closest to the reference
- * point
- *
- * @param p
- * the reference point
- * @return the closest target connection anchor to <code>p</code>
- */
- public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
- ConnectionAnchor closest = null;
- long min = Long.MAX_VALUE;
-
- Enumeration e = getTargetConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- return closest;
- }
-
- /**
- * returns all the target connection anchors on this node figure
- *
- * @return a vector of all the target connection anchors for this figure
- */
- public Vector getTargetConnectionAnchors() {
- return inputConnectionAnchors;
- }
-
- /**
- * Returns the name of the specified anchor
- *
- * @param anchor
- * the connectio anchor whose name is requested
- * @return the anchor's name
- */
- public String getNameForAnchor(ConnectionAnchor anchor) {
- if (anchor != null) {
- Iterator it = connectionAnchors.keySet().iterator();
- String name;
-
- while (it.hasNext()) {
- name = (String) it.next();
-
- if (anchor.equals(connectionAnchors.get(name))) {
- return name;
- }
- }
- }
- return null;
- }
-
- public void setAnchorsVisible(boolean visible) {
- if (anchorsVisible != visible) {
- anchorsVisible = visible;
- ConnectionAnchor port;
- List all = new ArrayList();
- all.addAll(getTargetConnectionAnchors());
- all.addAll(getSourceConnectionAnchors());
- Iterator it = all.iterator();
- while (it.hasNext()) {
- IFigure fig = ((ConnectionAnchor) it.next()).getOwner();
- fig.setVisible(visible);
- }
- validate();
- }
- }
-
- /*
- * Determine which side of the figure to place each anchor based on the
- * relative position (north, south, east or west) of the connection line's
- * opposite anchor. If the anchor is not connected to anything else, the
- * default is to place target (input) anchors on the left and source
- * (output) anchors on the right.
- */
- protected void determineAnchorPositions() {
- Iterator it;
- topConnectionAnchors.clear();
- bottomConnectionAnchors.clear();
- leftConnectionAnchors.clear();
- rightConnectionAnchors.clear();
-
- if (anchorsVisible) {
- final Dimension size = baseFigure.getPreferredSize();
- PortConnectionAnchor port;
-
- // start with outputs
- it = getSourceConnectionAnchors().iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- int direction = port.getOrientation();
- if (direction == PositionConstants.NONE) {
- Point loc = port.getOwner().getParent().getBounds()
- .getLocation();
- // loc.x += size.width/2;
- // loc.y += size.height/2;
- Iterator itc = port.getConnections().iterator();
- if (itc.hasNext()) {
- while (itc.hasNext()) {
- PolylineConnection conn = (PolylineConnection) itc
- .next();
- ConnectionAnchor otherPort;
- if (port == conn.getSourceAnchor())
- otherPort = conn.getTargetAnchor();
- else
- otherPort = conn.getSourceAnchor();
- if (otherPort.getOwner() == null)
- continue;
- Point otherLoc = otherPort.getOwner().getParent()
- .getBounds().getLocation();
- // Dimension otherSize =
- // ((BaseNodeFigure)otherPort.getOwner().getParent()).getBaseFigure().getPreferredSize();
- // otherLoc.x += otherSize.width/2;
- // otherLoc.y += otherSize.height/2;
- direction = loc.getPosition(otherLoc);
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.WEST)
- leftConnectionAnchors.add(port);
- else
- rightConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(direction);
- break; // currently, only the first connection is
- // considered
- }
- } else {
- rightConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(PositionConstants.EAST);
- }
- } else {
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.WEST)
- leftConnectionAnchors.add(port);
- else
- rightConnectionAnchors.add(port);
- }
- }
- it = getTargetConnectionAnchors().iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- int direction = port.getOrientation();
- if (direction == PositionConstants.NONE) {
- Point loc = port.getOwner().getParent().getBounds()
- .getLocation();
- // loc.x += size.width/2;
- // loc.y += size.height/2;
- Iterator itc = port.getConnections().iterator();
- if (itc.hasNext()) {
- while (itc.hasNext()) {
- PolylineConnection conn = (PolylineConnection) itc
- .next();
- ConnectionAnchor otherPort;
- if (port == conn.getSourceAnchor())
- otherPort = conn.getTargetAnchor();
- else
- otherPort = conn.getSourceAnchor();
- if (otherPort.getOwner() == null)
- continue;
- Point otherLoc = otherPort.getOwner().getParent()
- .getBounds().getLocation();
- // Dimension otherSize =
- // ((BaseNodeFigure)otherPort.getOwner().getParent()).getBaseFigure().getPreferredSize();
- // otherLoc.x += otherSize.width/2;
- // otherLoc.y += otherSize.height/2;
- direction = loc.getPosition(otherLoc);
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.EAST)
- rightConnectionAnchors.add(port);
- else
- leftConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(direction);
- break; // currently, only the first connection is
- // considered
- }
- } else {
- leftConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(PositionConstants.WEST);
- }
- } else {
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.EAST)
- rightConnectionAnchors.add(port);
- else
- leftConnectionAnchors.add(port);
- }
- }
-
- Comparator comparePorts = new Comparator() {
- public int compare(Object arg0, Object arg1) {
- PortConnectionAnchor port0 = (PortConnectionAnchor) arg0;
- if (port0.getConnections().size() < 1)
- return 0;
- PortConnectionAnchor port1 = (PortConnectionAnchor) arg1;
- if (port1.getConnections().size() < 1)
- return 0;
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- if (port0.getOrientation() != PositionConstants.NONE)
- return 0;
- if (port1.getOrientation() != PositionConstants.NONE)
- return 0;
-
- PolylineConnection conn0 = (PolylineConnection) port0
- .getConnections().get(0);
- ConnectionAnchor otherPort0;
- if (port0 == conn0.getSourceAnchor())
- otherPort0 = conn0.getTargetAnchor();
- else
- otherPort0 = conn0.getSourceAnchor();
- Point otherLoc0 = otherPort0.getOwner().getParent()
- .getBounds().getLocation();
- // Dimension otherSize0 =
- // ((BaseNodeFigure)otherPort0.getOwner().getParent()).getBaseFigure().getPreferredSize();
- // otherLoc0.x += otherSize0.width/2;
- // otherLoc0.y += otherSize0.height/2;
-
- PolylineConnection conn1 = (PolylineConnection) port1
- .getConnections().get(0);
- ConnectionAnchor otherPort1;
- if (port1 == conn1.getSourceAnchor())
- otherPort1 = conn1.getTargetAnchor();
- else
- otherPort1 = conn1.getSourceAnchor();
- Point otherLoc1 = otherPort1.getOwner().getParent()
- .getBounds().getLocation();
- Dimension otherSize1 = ((BaseNodeFigure) otherPort1
- .getOwner().getParent()).getBaseFigure()
- .getPreferredSize();
- // otherLoc1.x += otherSize1.width/2;
- // otherLoc1.y += otherSize1.height/2;
-
- switch (((PortFigure) port0.getOwner()).getOrientation()) {
- case PositionConstants.NORTH:
- case PositionConstants.SOUTH:
- return otherLoc0.x - otherLoc1.x;
- case PositionConstants.EAST:
- case PositionConstants.WEST:
- return otherLoc0.y - otherLoc1.y;
- }
- return 0;
- }
- };
-
- // order the anchors on each side so connection lines don't cross
- Collections.sort(topConnectionAnchors, comparePorts);
- Collections.sort(leftConnectionAnchors, comparePorts);
- Collections.sort(bottomConnectionAnchors, comparePorts);
- Collections.sort(rightConnectionAnchors, comparePorts);
- }
- }
-
- protected void placeAnchors() {
- determineAnchorPositions();
- if (anchorsVisible) {
- Iterator it;
- PortConnectionAnchor port;
- int y, x;
-
- Dimension sz = baseFigure.getPreferredSize();
- LayoutManager layout = getLayoutManager();
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
-
- // left ports
- x = 0;
- y = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // keep a constant inset on all 4 sides of the icon
- // if ( topConnectionAnchors.size()>0 )
- y += d.height;
- y += (sz.height - (leftConnectionAnchors.size() * (d.height + FigureConstants.PORT_SPACING))) / 2;
- it = leftConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- y += d.height + FigureConstants.PORT_SPACING;
- }
-
- // right ports
- x = sz.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x += d.width;
- y = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- y += d.height;
- y += (sz.height - (rightConnectionAnchors.size() * (d.height + FigureConstants.PORT_SPACING))) / 2;
- it = rightConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- y += d.height + FigureConstants.PORT_SPACING;
- }
-
- // top ports
- y = 0;
- x = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x += d.width;
- x += (sz.width - (topConnectionAnchors.size() * (d.width + FigureConstants.PORT_SPACING))) / 2;
- it = topConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- x += d.width + FigureConstants.PORT_SPACING;
- }
-
- // bottom ports
- y = sz.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- y += d.height;
- x = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x += d.width;
- x += (sz.width - (bottomConnectionAnchors.size() * (d.width + FigureConstants.PORT_SPACING))) / 2;
- it = bottomConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- x += d.width + FigureConstants.PORT_SPACING;
- }
- }
- }
-
- /**
- * CR389070: Figures are abbreviating rule figures names and making them
- * unreadable Anchor size is now dependent on icon size, not constant. Asks
- * the connection anchor for its size.
- */
- public Dimension getAnchorSize() {
- Dimension d = new Dimension(FigureConstants.PORT_SIDE,
- FigureConstants.PORT_SIDE);
- if (!connectionAnchors.isEmpty()) {
- Iterator iter = connectionAnchors.values().iterator();
- PortConnectionAnchor a = (PortConnectionAnchor) iter.next();
- d = a.getOwner().getPreferredSize();
- }
- return d;
- }
-
- public Insets getAnchorInsets() {
- Insets in = new Insets(0, 0, 0, 0);
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- in.left = d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- in.right = d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- in.top = d.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- in.bottom = d.height;
- return in;
- }
-
- public void invalidate() {
- super.invalidate();
- }
-
- /**
- * validate method override to arrange the input and output ports around the
- * links of the node figures
- */
- public void validate() {
- placeAnchors();
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- int x = 0;
- int y = 0;
- // if anchors are not visible (CompoundNodeFigure is maximized) always
- // set position at 0,0
- if (anchorsVisible) {
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x = d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- y = d.height;
- }
- getLayoutManager().setConstraint(baseFigure,
- new Rectangle(x, y, -1, -1));
- layout();
- super.validate();
- }
-
- /***************************************************************************
- * Miscellaneous
- **************************************************************************/
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#useLocalCoordinates()
- */
- protected boolean useLocalCoordinates() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#setBounds(org.eclipse.draw2d.geometry.Rectangle)
- */
- public void setBounds(Rectangle rect) {
- Rectangle r = rect.getCopy();
- r.x = 0;
- r.y = 0;
- if (anchorsVisible) {
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- {
- r.x += d.width;
- r.width -= d.width;
- }
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- r.width -= d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- {
- r.y += d.height;
- r.height -= d.height;
- }
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- r.height -= d.height;
- }
- baseFigure.setBounds(r);
- r.setLocation(rect.getLocation());
- super.setBounds(r);
- }
-
- public Rectangle getBounds() {
- Dimension size = baseFigure.getBounds().getSize();
- if (anchorsVisible) {
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- size.height += d.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- size.height += d.height;
- }
- Rectangle r = super.getBounds();
- r.setSize(size);
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
- */
- public Dimension getPreferredSize(int wHint, int hHint) {
- Dimension size = baseFigure.getPreferredSize(wHint, hHint).getCopy();
- if (anchorsVisible) {
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- size.height += d.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- size.height += d.height;
- }
- return size;
- }
-
- public static void moveToTop(IFigure parent, IFigure child) {
- parent.getChildren().remove(child);
- parent.getChildren().add(child);
- }
-
- public void moveToTop() {
- IFigure parent = getParent();
- IFigure child = this;
- while (parent != null && !(parent instanceof Layer)) {
- child = parent;
- parent = parent.getParent();
- }
- if (parent instanceof Layer) {
- parent.getChildren().remove(child);
- parent.getChildren().add(child);
- }
- }
-
- /***************************************************************************
- * IBaseFigure methods delegate to the baseFigure
- **************************************************************************/
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setText(java.lang.String)
- */
- public void setText(String text) {
- baseFigure.setText(text);
- }
-
- public void setIcon(Image image) {
- baseFigure.setIcon(image);
- }
-
- /**
- * The description property of a DiagramNode is displayed as a tool tip.
- * This method is used to set it. Passing a null or zero-length string will
- * remove the tool tip
- *
- * @param description
- * the description to use for this node's tool tip
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText(java.lang.String)
- */
- public void setToolTipText(String text) {
- baseFigure.setToolTipText(text);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator)
- */
- public void addDecorator(BaseFigureDecorator decorator) {
- baseFigure.addDecorator(decorator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- baseFigure.removeDecorator();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(int position) {
- baseFigure.removeDecorator(position);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getDecorators()
- */
- public List getDecorators() {
- return baseFigure.getDecorators();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getText()
- */
- public String getText() {
- return baseFigure.getText();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public Rectangle getTextBounds() {
- Rectangle r = baseFigure.getTextBounds().getCopy();
- r.x += getBounds().x;
- r.y += getBounds().y;
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getIcon()
- */
- public Image getIcon() {
- return baseFigure.getIcon();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getToolTipText()
- */
- public String getToolTipText() {
- return baseFigure.getToolTipText();
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java
deleted file mode 100644
index b558a025c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.StringConverter; import org.eclipse.jface.util.Assert; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.FontDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; /** * * A field editor for a font type preference. * */ public class ColorFontFieldEditor extends FieldEditor { /** * * The change font button, or <code>null</code> if none * * (before creation and after disposal). * */ private Button changeFontButton = null; /** * * The text for the change font button, or <code>null</code> * * if missing. * */ private String changeButtonText; /** * * The text for the preview, or <code>null</code> if no preview is desired * */ private String previewText; /** * * Font data for the chosen font button, or <code>null</code> if none. * */ private FontData[] chosenFont; /** * * Font color for the chosen font * */ private RGB fontRGB; /** * * The label that displays the selected font, or <code>null</code> if * none. * */ private Label valueControl; /** * * The previewer, or <code>null</code> if none. * */ private DefaultPreviewer previewer; /** * * Internal font previewer implementation. * */ private static class DefaultPreviewer { private Text text; private String string; private Font font; public DefaultPreviewer(String s, Composite parent) { string = s; text = new Text(parent, SWT.READ_ONLY | SWT.BORDER); text.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { if (font != null) font.dispose(); } }); if (string != null) text.setText(string); } public Control getControl() { return text; } public void setFont(FontData[] fontData) { if (font != null) font.dispose(); font = new Font(text.getDisplay(), fontData); text.setFont(font); } public void setRGB(RGB fontRGB) { if (fontRGB != null) text.setForeground(new Color(null, fontRGB)); } public int getPreferredExtent() { return 40; } } /** * * Creates a new font field editor * */ protected ColorFontFieldEditor() { } /** * * Creates a font field editor with an optional preview area. * * * * @param name * the name of the preference this field editor works on * * @param labelText * the label text of the field editor * * @param previewAreaText * the text used for the preview window. If it is * * <code>null</code> there will be no preview area, * * @param parent * the parent of the field editor's control * */ public ColorFontFieldEditor( String name, String labelText, String previewAreaText, Composite parent) { init(name, labelText); previewText = previewAreaText; changeButtonText = JFaceResources.getString("openChange"); //$NON-NLS-1$ createControl(parent); } /** * * Creates a font field editor without a preview. * * * * @param name * the name of the preference this field editor works on * * @param labelText * the label text of the field editor * * @param parent * the parent of the field editor's control * */ public ColorFontFieldEditor(String name, String labelText, Composite parent) { this(name, labelText, null, parent); } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ protected void adjustForNumColumns(int numColumns) { GridData data = new GridData(); if (valueControl.getLayoutData() != null) data = (GridData) valueControl.getLayoutData(); data.horizontalSpan = numColumns - getNumberOfControls() + 1; valueControl.setLayoutData(data); } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ protected void applyFont() { if (chosenFont != null && previewer != null) previewer.setFont(chosenFont); } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ protected void doFillIntoGrid(Composite parent, int numColumns) { getLabelControl(parent); valueControl = getValueControl(parent); GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); gd.horizontalSpan = numColumns - getNumberOfControls() + 1; valueControl.setLayoutData(gd); if (previewText != null) { previewer = new DefaultPreviewer(previewText, parent); gd = new GridData(GridData.FILL_HORIZONTAL); gd.heightHint = previewer.getPreferredExtent(); gd.widthHint = previewer.getPreferredExtent(); previewer.getControl().setLayoutData(gd); } changeFontButton = getChangeControl(parent); gd = new GridData(); gd.heightHint = convertVerticalDLUsToPixels( changeFontButton, IDialogConstants.BUTTON_HEIGHT); int widthHint = convertHorizontalDLUsToPixels( changeFontButton, IDialogConstants.BUTTON_WIDTH); gd.widthHint = Math.max( widthHint, changeFontButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x); changeFontButton.setLayoutData(gd); } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ protected void doLoad() { if (changeFontButton == null) return; fontRGB = PreferenceConverter.getColor( getPreferenceStore(), getPreferenceName() + "Color"); updateFont( PreferenceConverter.getFontDataArray( getPreferenceStore(), getPreferenceName())); } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ protected void doLoadDefault() { if (changeFontButton == null) return; updateFont( PreferenceConverter.getDefaultFontDataArray( getPreferenceStore(), getPreferenceName())); } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ protected void doStore() { if (chosenFont != null) { PreferenceConverter.setValue( getPreferenceStore(), getPreferenceName(), chosenFont); } if (fontRGB != null) { PreferenceConverter.setValue( getPreferenceStore(), getPreferenceName() + "Color", fontRGB); } } /** * * Returns the change button for this field editor. * * * * @return the change button * */ protected Button getChangeControl(Composite parent) { if (changeFontButton == null) { changeFontButton = new Button(parent, SWT.PUSH); if (changeButtonText != null) changeFontButton.setText(changeButtonText); changeFontButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { FontDialog fontDialog = new FontDialog(changeFontButton.getShell()); if (chosenFont != null) fontDialog.setFontList(chosenFont); if (fontRGB != null) fontDialog.setRGB(fontRGB); FontData font = fontDialog.open(); if (font != null) { FontData[] oldFont = chosenFont; if (oldFont == null) oldFont = JFaceResources.getDefaultFont() .getFontData(); setPresentsDefaultValue(false); FontData[] newData = new FontData[1]; newData[0] = font; fontRGB = fontDialog.getRGB(); updateFont(newData); fireValueChanged(VALUE, oldFont[0], font); } } }); changeFontButton.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent event) { changeFontButton = null; } }); changeFontButton.setFont(parent.getFont()); setButtonLayoutData(changeFontButton); } else { checkParent(changeFontButton, parent); } return changeFontButton; } /* * (non-Javadoc) * * Method declared on FieldEditor. * */ public int getNumberOfControls() { if (previewer == null) return 3; else return 4; } /** * * Returns the preferred preview height. * * * * @return the height, or <code>-1</code> if no previewer * * is installed * */ public int getPreferredPreviewHeight() { if (previewer == null) return -1; return previewer.getPreferredExtent(); } /** * * Returns the preview control for this field editor. * * * * @return the preview control * */ public Control getPreviewControl() { if (previewer == null) return null; return previewer.getControl(); } /** * * Returns the value control for this field editor. The value control * * displays the currently selected font name. * * * * @return the value control * */ protected Label getValueControl(Composite parent) { if (valueControl == null) { valueControl = new Label(parent, SWT.LEFT); valueControl.setFont(parent.getFont()); valueControl.addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent event) { valueControl = null; } }); } else { checkParent(valueControl, parent); } return valueControl; } /** * * Sets the text of the change button. * * * * @param text * the new text * */ public void setChangeButtonText(String text) { Assert.isNotNull(text); changeButtonText = text; if (changeFontButton != null) changeFontButton.setText(text); } /** * * Updates the change font button and the previewer to reflect the * * newly selected font. * */ private void updateFont(FontData font[]) { FontData[] bestFont = JFaceResources.getFontRegistry().bestDataArray( font, valueControl.getDisplay()); // if we have nothing valid do as best we can if (bestFont == null) bestFont = getDefaultFontData(); // Now cache this value in the receiver this.chosenFont = bestFont; if (valueControl != null) { if (fontRGB != null) valueControl.setForeground(new Color(null, fontRGB)); valueControl.setText(StringConverter.asString(chosenFont[0])); } if (previewer != null) { previewer.setFont(bestFont); } } /** * * Store the default preference for the field * * being edited * */ protected void setToDefault() { FontData[] defaultFontData = PreferenceConverter.getDefaultFontDataArray( getPreferenceStore(), getPreferenceName()); PreferenceConverter.setValue( getPreferenceStore(), getPreferenceName(), defaultFontData); } /** * * Get the system default font data. * */ private FontData[] getDefaultFontData() { return valueControl.getDisplay().getSystemFont().getFontData(); } /* * * @see FieldEditor.setEnabled(boolean,Composite). * */ public void setEnabled(boolean enabled, Composite parent) { super.setEnabled(enabled, parent); getChangeControl(parent).setEnabled(enabled); getValueControl(parent).setEnabled(enabled); } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java
deleted file mode 100644
index 42114b07e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.util.Assert; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; /** * * A field editor for a combo box that allows the drop-down selection of one of * a list of items. * */ public class ComboFieldEditor extends FieldEditor { /** * * The <code>Combo</code> widget. * */ private Combo fCombo; /** * * The value (not the name) of the currently selected item in the Combo * widget. * */ private String fValue; /** * * The names (labels) and underlying values to populate the combo widget. * These should be * * arranged as: { {name1, value1}, {name2, value2}, ...} * */ private String[][] fEntryNamesAndValues; public ComboFieldEditor(String name, String labelText, String[][] entryNamesAndValues, Composite parent) { init(name, labelText); Assert.isTrue(checkArray(entryNamesAndValues)); fEntryNamesAndValues = entryNamesAndValues; createControl(parent); } /** * * Checks whether given <code>String[][]</code> is of "type" * * <code>String[][2]</code>. * * * * @return <code>true</code> if it is ok, and <code>false</code> * otherwise * */ private boolean checkArray(String[][] table) { if (table == null) { return false; } for (int i = 0; i < table.length; i++) { String[] array = table[i]; if (array == null || array.length != 2) { return false; } } return true; } /** * * @see FieldEditor#adjustForNumColumns(int) * */ protected void adjustForNumColumns(int numColumns) { if (numColumns > 1) { Control control = getLabelControl(); int left = numColumns; if (control != null) { ((GridData) control.getLayoutData()).horizontalSpan = 1; left = left - 1; } ((GridData) fCombo.getLayoutData()).horizontalSpan = left; } else { Control control = getLabelControl(); if (control != null) { ((GridData) control.getLayoutData()).horizontalSpan = 1; } ((GridData) fCombo.getLayoutData()).horizontalSpan = 1; } } /** * * @see FieldEditor#doFillIntoGrid(Composite, int) * */ protected void doFillIntoGrid(Composite parent, int numColumns) { int comboC = 1; if (numColumns > 1) { comboC = numColumns - 1; } Control control = getLabelControl(parent); GridData gd = new GridData(); gd.horizontalSpan = 1; control.setLayoutData(gd); control = getComboBoxControl(parent); gd = new GridData(); gd.horizontalSpan = comboC; gd.horizontalAlignment = GridData.FILL; control.setLayoutData(gd); } /** * * @see FieldEditor#doLoad() * */ protected void doLoad() { updateComboForValue(getPreferenceStore().getString(getPreferenceName())); } /** * * @see FieldEditor#doLoadDefault() * */ protected void doLoadDefault() { updateComboForValue(getPreferenceStore().getDefaultString( getPreferenceName())); } /** * * @see FieldEditor#doStore() * */ protected void doStore() { if (fValue == null) { getPreferenceStore().setToDefault(getPreferenceName()); return; } getPreferenceStore().setValue(getPreferenceName(), fValue); } /** * * @see FieldEditor#getNumberOfControls() * */ public int getNumberOfControls() { return 1; } /** * * Lazily create and return the Combo control. * */ public Combo getComboBoxControl(Composite parent) { if (fCombo == null) { fCombo = new Combo(parent, SWT.READ_ONLY); for (int i = 0; i < fEntryNamesAndValues.length; i++) { fCombo.add(fEntryNamesAndValues[i][0], i); } fCombo.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent evt) { String oldValue = fValue; String name = fCombo.getText(); fValue = getValueForName(name); setPresentsDefaultValue(false); fireValueChanged(VALUE, oldValue, fValue); } }); } return fCombo; } /** * * Given the name (label) of an entry, return the corresponding value. * */ protected String getValueForName(String name) { for (int i = 0; i < fEntryNamesAndValues.length; i++) { String[] entry = fEntryNamesAndValues[i]; if (name.equals(entry[0])) { return entry[1]; } } return fEntryNamesAndValues[0][0]; } /** * * Set the name in the combo widget to match the specified value. * */ protected void updateComboForValue(String value) { fValue = value; for (int i = 0; i < fEntryNamesAndValues.length; i++) { if (value.equals(fEntryNamesAndValues[i][1])) { fCombo.setText(fEntryNamesAndValues[i][0]); return; } } if (fEntryNamesAndValues.length > 0) { fValue = fEntryNamesAndValues[0][1]; } } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java
deleted file mode 100644
index 69e0ad470..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-/**
- * @author bbrodt
- *
- * Interface definition for listeners of CompoundFigure events. Events are
- * generated when a user presses a different tab (tabChanged event) or presses
- * one of the minimize/maximize/restore buttons (stateChanged event)
- */
-public interface CompoundFigureListener extends WindowFigureListener {
- void stateChanged(int oldState, int newState);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java
deleted file mode 100644
index f44871def..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ActionEvent;
-import org.eclipse.draw2d.ActionListener;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The figure for Compound nodes
- */
-public class CompoundNodeFigure extends BaseNodeFigure implements
- FreeformFigure, IContainerFigure {
- public final static int MINIMIZED = 1;
-
- public final static int RESTORED = 2;
-
- public final static int MAXIMIZED = 3;
-
- private int state = RESTORED;
-
- private TitleBarButton minButton;
-
- private TitleBarButton maxButton;
-
- private IconFigure iconFigure;
-
- private WindowFigure windowFigure;
-
- private static String DEFAULT_NAME = "CompoundNode";
-
- private static String DEFAULT_ICON = "editor/CompoundNode.gif";
-
- private static Image minimizeImage = EditorPlugin.getDefault().getImage(
- "minimize.gif");
-
- private static Image minimizeHiliteImage = EditorPlugin.getDefault()
- .getImage("minimize_hilite.gif");
-
- private static Image maximizeImage = EditorPlugin.getDefault().getImage(
- "maximize.gif");
-
- private static Image maximizeHiliteImage = EditorPlugin.getDefault()
- .getImage("maximize_hilite.gif");
-
- private static Image restoreImage = EditorPlugin.getDefault().getImage(
- "restore.gif");
-
- private static Image restoreHiliteImage = EditorPlugin.getDefault()
- .getImage("restore_hilite.gif");
-
- public CompoundNodeFigure() {
- // create all of the figures and adornments:
- // the icon figure
- super(new IconFigure(DEFAULT_NAME, EditorPlugin.getDefault().getImage(
- DEFAULT_ICON)));
- iconFigure = (IconFigure) getBaseFigure();
- // and the window figure
- windowFigure = new WindowFigure();
- windowFigure.setForegroundColor(IconFigure.defaultForegroundColor);
- windowFigure.setFont(IconFigure.defaultFont);
-
- // then the minimize/maximize buttons.
- // Note that the maxButton is also used for the "Restore" action
- // TODO:
- // The reason for putting these buttons in CompoundNodeFigure instead of
- // WindowFigure where they really belong, is that the TitleBarButton is
- // a
- // draw2d Button (which subclasses Figure) and these must be placed in
- // the
- // titlebar (i.e. a SchemeBorder) because that's where they belong. The
- // problem
- // with this is that the Figure.paint() method first draws all of its
- // children
- // figures, then the border which means that the buttons would be
- // obscured.
- // This should be fixed as time allows and the WindowFigureListener
- // interface
- // should then also be modified to include a buttonPressed()
- // notification
- // for which CompoundNodeFigure can be a listener.
- minButton = new TitleBarButton(minimizeImage, minimizeHiliteImage,
- null, null);
- maxButton = new TitleBarButton(maximizeImage, maximizeHiliteImage,
- restoreImage, restoreHiliteImage);
-
- add(minButton);
- add(maxButton);
-
- minButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setState(CompoundNodeFigure.MINIMIZED);
- }
- });
- maxButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setState(maxButton.getState() ? CompoundNodeFigure.MAXIMIZED
- : CompoundNodeFigure.RESTORED);
- }
- });
-
- // show as a normal window initially
- showIcon();
-
- // testing BaseFigureDecorators:
- // BaseFigureDecorator decorator;
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "top right",
- // PositionConstants.NORTH_EAST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "top left",
- // PositionConstants.NORTH_WEST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "bottom right",
- // PositionConstants.SOUTH_EAST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "bottom left",
- // PositionConstants.SOUTH_WEST);
- // addDecorator(decorator);
- }
-
- public void setOpaque(boolean flag) {
- windowFigure.setOpaque(flag);
- }
-
- /*
- * Remove the window figure and its buttons and replace them with the icon
- * figure.
- */
- private void showIcon() {
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(false);
- minButton.setVisible(false);
- maxButton.setVisible(false);
- super.setBaseFigure(iconFigure);
-
- setAnchorsVisible(true);
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(true);
- }
-
- /*
- * Remove the icon figure and replace with the window figure. Make sure the
- * buttons are reset to their correct states.
- */
- private void showWindow() {
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(false);
- if (state == RESTORED) {
- super.setBaseFigure(windowFigure);
-
- minButton.setVisible(true);
- minButton.setState(false);
- minButton.setToolTip(new Label("Minimize"));
-
- maxButton.setVisible(true);
- maxButton.setState(false);
- maxButton.setToolTip(new Label("Maximize"));
-
- setAnchorsVisible(true);
- } else if (state == MAXIMIZED) {
- setAnchorsVisible(false);
-
- Rectangle constraint = new Rectangle(0, 0, -1, -1);
- IFigure parent = getParent();
- if (parent != null) {
- constraint = parent.getBounds().getCopy();
- constraint.width += constraint.x;
- constraint.height += constraint.y;
- constraint.x = 0;
- constraint.y = 0;
- }
-
- super.setBaseFigure(windowFigure, constraint);
- if (parent != null && parent.getLayoutManager() != null) {
- // System.out.println("CompoundNode.showWindow: maximize
- // "+constraint);
- parent.getLayoutManager().setConstraint(this, constraint);
- }
-
- // the maximize button is used for both Maximize and Restore actions
- minButton.setVisible(false);
-
- maxButton.setVisible(true);
- maxButton.setState(true);
- maxButton.setToolTip(new Label("Restore"));
- }
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(true);
- }
-
- public void addDecorator(BaseFigureDecorator decorator) {
- iconFigure.addDecorator(decorator);
- }
-
- public void removeDecorator() {
- iconFigure.removeDecorator();
- }
-
- public void removeDecorator(int position) {
- iconFigure.removeDecorator(position);
- }
-
- public void setHilight(boolean flag) {
- windowFigure.setHighlight(flag);
- if (flag)
- moveToTop();
- }
-
- public void setText(String name) {
- iconFigure.setText(name);
- windowFigure.setText(name);
- }
-
- public void setIcon(Image image) {
- iconFigure.setIcon(image);
- }
-
- public void setToolTipText(String text) {
- iconFigure.setToolTipText(text);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#layout()
- */
- public void validate() {
- LayoutManager layout = getLayoutManager();
- if (state == MINIMIZED) {
- // iconFigure.validate();
- } else if (state == RESTORED) {
- Rectangle r = windowFigure.getBounds().getCopy();
- Insets i = windowFigure.getInsets();
- Dimension dm = maxButton.getSize();
- Insets p = windowFigure.getTabbedTitleBarBorder().getPadding();
- layout.setConstraint(maxButton, new Rectangle(r.x + r.width
- - dm.width - p.right - i.right, r.y + p.top + i.top
- - dm.height - i.bottom, -1, -1));
- layout.setConstraint(minButton, new Rectangle(r.x + r.width - 2
- * dm.width - 2 * p.right - i.right, r.y + p.top + i.top
- - dm.height - i.bottom, -1, -1));
- } else if (state == MAXIMIZED) {
- // CR387660: restore icon on complex activity bounces around
- // we need to use the parent's bounds when maximized instead of
- // current window bounds
- if (getParent() == null)
- return;
- Rectangle r = getParent().getBounds().getCopy();
- Insets i = windowFigure.getInsets();
- Dimension dm = maxButton.getSize();
- Insets p = windowFigure.getTabbedTitleBarBorder().getPadding();
- layout.setConstraint(maxButton, new Rectangle(r.x + r.width
- - dm.width - p.right - i.right, r.y + p.top, -1, -1));
- }
- super.validate();
- }
-
- public IconFigure getIconFigure() {
- return iconFigure;
- }
-
- /**
- * @return
- */
- public WindowFigure getWindowFigure() {
- return windowFigure;
- }
-
- public void setFont(Font f) {
- iconFigure.setFont(f);
- windowFigure.setFont(f);
- }
-
- public void setForegroundColor(Color c) {
- iconFigure.setForegroundColor(c);
- windowFigure.setForegroundColor(c);
- }
-
- public void setBackgroundColor(Color c) {
- iconFigure.setBackgroundColor(c);
- windowFigure.setBackgroundColor(c);
- }
-
- public int getState() {
- return state;
- }
-
- public void setState(int newState) {
- int oldState = state;
- state = newState;
-
- if (state == CompoundNodeFigure.MINIMIZED) {
- if (getParent() != null && getParent().getLayoutManager() != null) {
- Rectangle constraint = (Rectangle) getParent()
- .getLayoutManager().getConstraint(this);
- constraint.width = -1;
- constraint.height = -1;
- }
- showIcon();
- } else if (state == CompoundNodeFigure.MAXIMIZED) {
- if (getParent() != null && getParent().getLayoutManager() != null) {
- Rectangle constraint = (Rectangle) getParent()
- .getLayoutManager().getConstraint(this);
- constraint.x = 0;
- constraint.y = 0;
- constraint.width = -1;
- constraint.height = -1;
- }
- showWindow();
- } else if (state == CompoundNodeFigure.RESTORED) {
- if (getParent() != null && getParent().getLayoutManager() != null) {
- Rectangle constraint = (Rectangle) getParent()
- .getLayoutManager().getConstraint(this);
- constraint.setSize(windowFigure.getBounds().getSize());
- }
- showWindow();
- }
- fireStateChanged(oldState, newState);
- }
-
- protected void fireStateChanged(int oldState, int newState) {
- Object l[] = windowFigure.getTabbedTitleBarBorder().getListeners();
- for (int i = 0; i < l.length; ++i) {
- if (l[i] instanceof CompoundFigureListener)
- ((CompoundFigureListener) l[i])
- .stateChanged(oldState, newState);
- }
- }
-
- public Point getScrollPosition() {
- return windowFigure.getScrollPosition();
- }
-
- public int addTab(String s) {
- return windowFigure.addTab(s);
- }
-
- public void removeTab(int index) {
- windowFigure.removeTab(index);
- }
-
- public void setCurrentTab(int index) {
- windowFigure.setCurrentTab(index);
- }
-
- public int getCurrentTab() {
- return windowFigure.getCurrentTab();
- }
-
- public void setContents(int index, Object contents) {
- windowFigure.setContents(index, contents);
- }
-
- public Object getContents(int index) {
- return windowFigure.getContents(index);
- }
-
- public Object getContents() {
- return windowFigure.getContents();
- }
-
- public TabbedTitleBarBorder getTabbedTitleBarBorder() {
- return windowFigure.getTabbedTitleBarBorder();
- }
-
- public void addCompoundFigureListener(CompoundFigureListener listener) {
- windowFigure.getTabbedTitleBarBorder()
- .addTabbedWindowListener(listener);
- }
-
- public void removeCompoundFigureListener(CompoundFigureListener listener) {
- windowFigure.getTabbedTitleBarBorder().removeTabbedWindowListener(
- listener);
- }
-
- public Dimension getMinimumSize(int wHint, int hHint) {
- if (getState() == CompoundNodeFigure.RESTORED) {
- Dimension d = windowFigure.getMinimumSize(wHint, hHint);
- d.width += minButton.getSize().width
- + maxButton.getSize().width
- + 2
- * windowFigure.getTabbedTitleBarBorder().getPadding()
- .getWidth();
- return d;
- }
- if (getState() == CompoundNodeFigure.MINIMIZED)
- return iconFigure.getMinimumSize(wHint, hHint);
- return super.getMinimumSize(wHint, hHint);
- }
-
- // //////////////////////////////////////////////////////////////////////
- // FreeformFigure methods
- // //////////////////////////////////////////////////////////////////////
-
- private WindowFreeformHelper helper = new WindowFreeformHelper(this);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#addFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void addFreeformListener(FreeformListener listener) {
- addListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#fireExtentChanged()
- */
- public void fireExtentChanged() {
- // CR389495: Working with nested complex activities causes in the BP
- // editor causes lockup
- // not specifically related to this CR, but caused a problem when
- // compound node
- // was moved beyond viewport's client area and de-selected - this would
- // resize
- // the viewport so that compound node no longer participated in bounds
- // calculation.
- if (state == MAXIMIZED) {
- Iterator iter = getListeners(FreeformListener.class);
- while (iter.hasNext())
- ((FreeformListener) iter.next()).notifyFreeformExtentChanged();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#getFreeformExtent()
- */
- public Rectangle getFreeformExtent() {
- // CR389495: Working with nested complex activities causes in the BP
- // editor causes lockup
- // same as above
- if (state == MAXIMIZED)
- return helper.getFreeformExtent();
- return getBounds();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#removeFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void removeFreeformListener(FreeformListener listener) {
- removeListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#setFreeformBounds(org.eclipse.draw2d.geometry.Rectangle)
- */
- public void setFreeformBounds(Rectangle bounds) {
- if (getState() == MAXIMIZED)
- helper.setFreeformBounds(bounds);
- }
-
- /*
- * CR389070: Figures are abbreviating rule figures names and making them
- * unreadable New Method on IContainerFigure
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IContainerFigure#getLayer(java.lang.Object)
- */
- public Layer getLayer(Object key) {
- if (windowFigure != null && windowFigure.isVisible())
- return windowFigure.getLayer(key);
- return null;
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java
deleted file mode 100644
index f0ffc1aa4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.draw2d.ColorConstants; import org.eclipse.swt.graphics.Color; /** * * * * Constants for figure dimensions, etc. used in the sample app * */ public class FigureConstants { /** * * * */ private FigureConstants() { } public static final int PORT_SIDE = 10; // (int)Math.round( ARROW_SIDE * // Math.cos( 30 ) ); public static final Color PORT_INPUT_TRIANGLE_COLOR = ColorConstants.black; public static final Color PORT_OUTPUT_TRIANGLE_COLOR = ColorConstants.black; public static final Color PORT_EXCEPTION_TRIANGLE_COLOR = ColorConstants.red; public static final Color PORT_START_COLOR = ColorConstants.green; public static final Color PORT_FINISH_COLOR = ColorConstants.red; // CR389070: Figures are abbreviating rule figures names and making them // unreadable public static final int PORT_SPACING = 2; // ARROW_SIDE / 2; public static final Color PORT_INPUT_RECTANGLE_COLOR = ColorConstants.white; public static final Color PORT_OUTPUT_RECTANGLE_COLOR = ColorConstants.white; // this is the type of port; input or output public static int INPUT_PORT = 0; public static int OUTPUT_PORT = 1; } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java
deleted file mode 100644
index 545db1d66..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java
+++ /dev/null
@@ -1,685 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ColorFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * This class represents a preference page that is contributed to the
- * Preferences dialog. By subclassing <samp>FieldEditorPreferencePage </samp>,
- * we can use the field support built into JFace that allows us to create a page
- * that is small and knows how to save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They are stored in the
- * preference store that belongs to the main plug-in class. That way,
- * preferences can be accessed directly via the preference store.
- */
-
-public class GEMPreferences extends FieldEditorPreferencePage implements
- IWorkbenchPreferencePage {
- // appearance
- public final static String USE_SYSTEM_COLORS = "UseSystemColors"; //$NON-NLS-1$
-
- public final static String CANVAS_COLOR = "CanvasColor"; //$NON-NLS-1$
-
- public final static String FIGURE_LABEL_FONT = "FigureLabelFont"; //$NON-NLS-1$
-
- public final static String FIGURE_LABEL_FONT_COLOR = "FigureLabelFontColor"; //$NON-NLS-1$
-
- public final static String LABEL_PLACEMENT = "LabelPlacement";
-
- public final static String INPUT_PORT_COLOR = "InputPortColor";
-
- public final static String OUTPUT_PORT_COLOR = "OutputPortColor";
-
- public final static String SHOW_LINE_LABELS = "ShowLineLabels";
-
- public final static String LINE_LABEL_FONT = "LineLabelFont"; //$NON-NLS-1$
-
- public final static String LINE_LABEL_FONT_COLOR = "LineLabelFontColor"; //$NON-NLS-1$
-
- public final static String LINE_LABEL_COLOR = "LineLabelColor"; //$NON-NLS-1$
-
- public final static String LINE_WIDTH = "LineWidth"; //$NON-NLS-1$
-
- public final static String LINE_COLOR = "LineColor"; //$NON-NLS-1$
-
- public final static String LINE_ROUTING = "LineRouting"; //$NON-NLS-1$
-
- public final static String SNAP_TO_GRID = "SnapToGrid"; //$NON-NLS-1$
-
- public final static String SNAP_TO_GEOMETRY = "SnapToGeometry"; //$NON-NLS-1$
-
- public final static String GRID_WIDTH = "GridWidth"; //$NON-NLS-1$
-
- public final static String GRID_HEIGHT = "GridHeight"; //$NON-NLS-1$
-
- public final static String GRID_COLOR = "GridColor"; //$NON-NLS-1$
-
- public final static String LABEL_PLACEMENT_TOP = "Top";
-
- public final static String LABEL_PLACEMENT_BOTTOM = "Bottom";
-
- public final static String LABEL_PLACEMENT_LEFT = "Left";
-
- public final static String LABEL_PLACEMENT_RIGHT = "Right";
-
- // "Direct" routing was intended for connections lines without bendpoints;
- // this has been removed because it is unnecessary.
- // public final static String LINE_ROUTING_DIRECT = "Direct";
- // "Manhattan" line routing creates orthogonal lines
- public final static String LINE_ROUTING_MANHATTAN = "Manhattan";
-
- // "Manual" routing allows user to create bendpoints
- public final static String LINE_ROUTING_MANUAL = "Manaul";
-
- private final static String[][] m_lineRoutingLabels = {
- // display, key
- // { GEMPlugin.getResourceString("CanvasPreferences.LABEL.Direct"),
- // LINE_ROUTING_DIRECT }, //$NON-NLS-1$ //$NON-NLS-2$
- {
- PreferenceMessages.CanvasPreferences_LABEL_Manual, LINE_ROUTING_MANUAL }, //$NON-NLS-1$ //$NON-NLS-2$
- {
- PreferenceMessages.CanvasPreferences_LABEL_Manhattan, LINE_ROUTING_MANHATTAN } //$NON-NLS-1$ //$NON-NLS-2$
- };
-
- private final static String[][] m_labelPlacementLabels = {
- {
- PreferenceMessages.CanvasPreferences_LABEL_Top, LABEL_PLACEMENT_TOP }, //$NON-NLS-1$ //$NON-NLS-2$
- {
- PreferenceMessages.CanvasPreferences_LABEL_Bottom, LABEL_PLACEMENT_BOTTOM }, //$NON-NLS-1$ //$NON-NLS-2$
- {
- PreferenceMessages.CanvasPreferences_LABEL_Left, LABEL_PLACEMENT_LEFT }, //$NON-NLS-1$ //$NON-NLS-2$
- {
- PreferenceMessages.CanvasPreferences_LABEL_Right, LABEL_PLACEMENT_RIGHT } //$NON-NLS-1$ //$NON-NLS-2$
- };
-
- private Group canvasGroup;
-
- private Group iconGroup;
-
- private Group lineGroup;
-
- private BooleanField useSystemColors;
-
- private ColorFieldEditor canvasColor;
-
- private BooleanField snapToGrid;
-
- private IntegerFieldEditor gridWidth;
-
- private IntegerFieldEditor gridHeight;
-
- private ColorFieldEditor gridColor;
-
- private BooleanField showLineLabels;
-
- private ColorFieldEditor lineLabelColor;
-
- private ColorFieldEditor lineColor;
-
- private ColorFontFieldEditor iconFont;
-
- private ColorFontFieldEditor lineFont;
-
- // private ColorFieldEditor inputPortColor;
- //
- // private ColorFieldEditor outputPortColor;
-
- // CR392586: resource leaks
- // at least keep leaks bounded...
- private static Hashtable resourceRegistry = new Hashtable();
-
- private class BooleanField extends BooleanFieldEditor {
- private Composite parent;
-
- public BooleanField(String name, String label, Composite parent) {
- super(name, label, parent);
- this.parent = parent;
- }
-
- public Button getButton() {
- return getChangeControl(parent);
- }
- }
-
- public GEMPreferences() {
- super(GRID);
- setPreferenceStore(EditorPlugin.getDefault().getPreferenceStore());
- setDescription("Preferences for the graphical page of FacesConfig editor.");
- initializeDefaults();
- }
-
- /**
- * Sets the default values of the preferences.
- */
- private void initializeDefaults() {
- IPreferenceStore store = getPreferenceStore();
- Font f = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- store.setDefault(USE_SYSTEM_COLORS, true);
- PreferenceConverter.setDefault(store, CANVAS_COLOR, new RGB(255, 255,
- 255));
- PreferenceConverter.setDefault(store, FIGURE_LABEL_FONT, f
- .getFontData());
- store.setDefault(LINE_WIDTH, 1);
- store.setDefault(LINE_ROUTING, getLineRoutingLabels()[0][1]);
- store.setDefault(SHOW_LINE_LABELS, true);
- PreferenceConverter.setDefault(store, LINE_COLOR, new RGB(0, 0, 0));
- PreferenceConverter.setDefault(store, LINE_LABEL_COLOR, new RGB(255,
- 255, 255));
- PreferenceConverter.setDefault(store, LINE_LABEL_FONT, f.getFontData());
- store.setDefault(SNAP_TO_GEOMETRY, true);
- store.setDefault(SNAP_TO_GRID, true);
- store.setDefault(GRID_WIDTH, 12);
- store.setDefault(GRID_HEIGHT, 12);
- PreferenceConverter.setDefault(store, GRID_COLOR,
- new RGB(230, 230, 230));
- }
-
- /**
- * Creates the field editors. Field editors are abstractions of the common
- * GUI blocks needed to manipulate various types of preferences. Each field
- * editor knows how to save and restore itself.
- */
-
- public void createFieldEditors() {
- useSystemColors = addBooleanField(
- USE_SYSTEM_COLORS,
- PreferenceMessages.CanvasPreferenceTab_LABEL_UseSystemColors,
- getFieldEditorParent());
-
- canvasGroup = new Group(getFieldEditorParent(), SWT.NULL);
- lineGroup = new Group(getFieldEditorParent(), SWT.NULL);
- iconGroup = new Group(getFieldEditorParent(), SWT.NULL);
-
- canvasGroup.setText(PreferenceMessages.CanvasPreferenceTab_LABEL_Canvas); //$NON-NLS-1$
- canvasColor = addColorField(
- CANVAS_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_BackgroundColor, canvasGroup); //$NON-NLS-1$
- addBooleanField(
- SNAP_TO_GEOMETRY,
- PreferenceMessages.CanvasPreferenceTab_LABEL_SnapToGeometry, canvasGroup); //$NON-NLS-1$
- snapToGrid = addBooleanField(
- SNAP_TO_GRID,
- PreferenceMessages.CanvasPreferenceTab_LABEL_SnapToGrid, canvasGroup); //$NON-NLS-1$
- gridColor = addColorField(
- GRID_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_GridLineColor, canvasGroup); //$NON-NLS-1$
- gridWidth = addIntegerField(
- GRID_WIDTH,
- PreferenceMessages.CanvasPreferenceTab_LABEL_GridWidth, canvasGroup); //$NON-NLS-1$
- gridHeight = addIntegerField(
- GRID_HEIGHT,
- PreferenceMessages.CanvasPreferenceTab_LABEL_GridHeight, canvasGroup); //$NON-NLS-1$
-
- iconGroup.setText(PreferenceMessages.CanvasPreferenceTab_LABEL_IconGroup); //$NON-NLS-1$
- iconFont = addFontField(
- FIGURE_LABEL_FONT,
- PreferenceMessages.CanvasPreferenceTab_LABEL_IconLabelFont, iconGroup); //$NON-NLS-1$
- addComboField(LABEL_PLACEMENT, PreferenceMessages.CanvasPreferenceTab_LABEL_LabelPlacement, //$NON-NLS-1$
- getLabelPlacementLabels(), iconGroup);
- // inputPortColor = addColorField(
- // INPUT_PORT_COLOR,
- // EditorPlugin
- // .getResourceString("CanvasPreferenceTab.LABEL.InputPortColor"),
- // iconGroup); //$NON-NLS-1$
- // outputPortColor = addColorField(
- // OUTPUT_PORT_COLOR,
- // EditorPlugin
- // .getResourceString("CanvasPreferenceTab.LABEL.OutputPortColor"),
- // iconGroup); //$NON-NLS-1$
-
- lineGroup.setText(PreferenceMessages.CanvasPreferenceTab_LABEL_LineGroup); //$NON-NLS-1$
- showLineLabels = addBooleanField(SHOW_LINE_LABELS, PreferenceMessages.CanvasPreferenceTab_LABEL_ShowLineLabels,
- lineGroup);
- lineFont = addFontField(
- LINE_LABEL_FONT,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineLabelFont, lineGroup); //$NON-NLS-1$
- lineLabelColor = addColorField(
- LINE_LABEL_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineLabelColor, lineGroup); //$NON-NLS-1$
- lineColor = addColorField(
- LINE_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineColor, lineGroup); //$NON-NLS-1$
- addIntegerField(
- LINE_WIDTH,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineWidth, lineGroup); //$NON-NLS-1$
- addComboField(LINE_ROUTING, PreferenceMessages.CanvasPreferenceTab_LABEL_LineRouting, //$NON-NLS-1$
- getLineRoutingLabels(), lineGroup);
- }
-
- protected void initialize() {
- // Color use: Default canvas colors should pick up system defaults
- // enable or disable all of the color and font selection controls in the
- // preference dialog
- // depending on whether the "Use System Colors" checkbox is selected.
- super.initialize();
-
- ((GridLayout) getFieldEditorParent().getLayout()).numColumns = 2;
-
- canvasGroup.setLayout(new GridLayout(3, false));
- canvasGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- canvasColor.fillIntoGrid(canvasGroup, 3);
- gridColor.fillIntoGrid(canvasGroup, 3);
-
- iconGroup.setLayout(new GridLayout(3, false));
- iconGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- iconFont.fillIntoGrid(iconGroup, 3);
-
- lineGroup.setLayout(new GridLayout(3, false));
- lineGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- lineColor.fillIntoGrid(lineGroup, 3);
- lineLabelColor.fillIntoGrid(lineGroup, 3);
- lineFont.fillIntoGrid(lineGroup, 3);
-
- boolean userColorsValue = !useSystemColors.getBooleanValue();
- boolean showLineLabelsValue = showLineLabels.getBooleanValue();
- boolean snapToGridValue = snapToGrid.getBooleanValue();
- canvasColor.setEnabled(userColorsValue, canvasGroup);
- gridColor.setEnabled(snapToGridValue && userColorsValue, canvasGroup);
- iconFont.setEnabled(userColorsValue, iconGroup);
- // inputPortColor.setEnabled(userColorsValue, iconGroup);
- // outputPortColor.setEnabled(userColorsValue, iconGroup);
- lineColor.setEnabled(userColorsValue, lineGroup);
- lineLabelColor.setEnabled(showLineLabelsValue && userColorsValue,
- lineGroup);
- lineFont.setEnabled(showLineLabelsValue && userColorsValue, lineGroup);
- gridWidth.setEnabled(snapToGridValue, canvasGroup);
- gridHeight.setEnabled(snapToGridValue, canvasGroup);
-
- useSystemColors.getButton().addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean userColorsValue = !useSystemColors
- .getBooleanValue();
- boolean showLineLabelsValue = showLineLabels
- .getBooleanValue();
- boolean snapToGridValue = snapToGrid.getBooleanValue();
-
- canvasColor.setEnabled(userColorsValue, canvasGroup);
- gridColor
- .setEnabled(snapToGridValue && userColorsValue,
- canvasGroup);
- iconFont.setEnabled(userColorsValue, iconGroup);
- // inputPortColor.setEnabled(userColorsValue,
- // iconGroup);
- // outputPortColor.setEnabled(userColorsValue,
- // iconGroup);
- lineColor.setEnabled(userColorsValue, lineGroup);
- lineLabelColor.setEnabled(showLineLabelsValue
- && userColorsValue, lineGroup);
- lineFont.setEnabled(showLineLabelsValue
- && userColorsValue, lineGroup);
- }
- });
-
- showLineLabels.getButton().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean userColorsValue = !useSystemColors.getBooleanValue();
- boolean showLineLabelsValue = showLineLabels.getBooleanValue();
- lineLabelColor.setEnabled(showLineLabelsValue
- && userColorsValue, lineGroup);
- lineFont.setEnabled(showLineLabelsValue && userColorsValue,
- lineGroup);
- }
- });
-
- snapToGrid.getButton().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean userColorsValue = !useSystemColors.getBooleanValue();
- boolean snapToGridValue = snapToGrid.getBooleanValue();
-
- gridColor.setEnabled(snapToGridValue && userColorsValue,
- canvasGroup);
- gridWidth.setEnabled(snapToGridValue, canvasGroup);
- gridHeight.setEnabled(snapToGridValue, canvasGroup);
- }
- });
-
- }
-
- public void init(IWorkbench workbench) {
- }
-
- protected ColorFieldEditor addColorField(String name, String labelText,
- Composite parent) {
- ColorFieldEditor f = new ColorFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- protected ComboFieldEditor addComboField(String name, String labelText,
- String[][] entryNamesAndValues, Composite parent) {
- ComboFieldEditor f = new ComboFieldEditor(name, labelText,
- entryNamesAndValues, parent);
- addField(f);
- return f;
- }
-
- protected IntegerFieldEditor addIntegerField(String name, String labelText,
- Composite parent) {
- IntegerFieldEditor f = new IntegerFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- protected BooleanField addBooleanField(String name, String labelText,
- Composite parent) {
- BooleanField f = new BooleanField(name, labelText, parent);
- addField(f);
- return f;
- }
-
- protected StringFieldEditor addStringField(String name, String labelText,
- Composite parent) {
- StringFieldEditor f = new StringFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- // protected NumberField addNumberField(String name, String labelText,
- // Composite parent)
- // {
- // NumberField f = new NumberField(name,labelText,parent);
- // addField(f);
- // return f;
- // }
-
- protected ColorFontFieldEditor addFontField(String name, String labelText,
- Composite parent) {
- ColorFontFieldEditor f = new ColorFontFieldEditor(name, labelText,
- parent);
- addField(f);
- return f;
- }
-
- public static String[][] getLineRoutingLabels() {
- return m_lineRoutingLabels;
- }
-
- public static String[][] getLabelPlacementLabels() {
- return m_labelPlacementLabels;
- }
-
- public static void propagateProperty(String property, EditPart part) {
- Iterator iter = part.getChildren().iterator();
- while (iter.hasNext()) {
- EditPart child = (EditPart) iter.next();
- Figure fig = (Figure) ((GraphicalEditPart) child).getFigure();
- GEMPreferences.propagateProperty(property, fig);
- propagateProperty(property, child);
- }
- }
-
- public static Color getColor(IPreferenceStore store, String property) {
- boolean useSystemColors = store.getBoolean(USE_SYSTEM_COLORS);
-
- Color c = ColorConstants.black;
- if (useSystemColors) {
- if (GRID_COLOR.equals(property))
- // c = ColorConstants.buttonDarkest;
- c = ColorConstants.button;
- if (LINE_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (LINE_LABEL_FONT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (LINE_LABEL_COLOR.equals(property))
- c = ColorConstants.listBackground;
- if (CANVAS_COLOR.equals(property))
- c = ColorConstants.listBackground;
- if (INPUT_PORT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (OUTPUT_PORT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (FIGURE_LABEL_FONT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- } else {
- // CR392586: resource leaks
- RGB rgb = PreferenceConverter.getColor(store, property);
- if (resourceRegistry.containsKey(rgb.toString()))
- return (Color) resourceRegistry.get(rgb.toString());
- c = new Color(Display.getCurrent(), rgb);
- resourceRegistry.put(rgb.toString(), c);
- }
- return c;
- }
-
- // CR392586: resource leaks
- public static Font getFont(IPreferenceStore store, String property) {
- FontData fd = PreferenceConverter.getFontData(store, property);
- if (resourceRegistry.containsKey(fd.toString()))
- return (Font) resourceRegistry.get(fd.toString());
-
- Font f = new Font(null, fd);
- resourceRegistry.put(fd.toString(), f);
- return f;
- }
-
- public static void propagateProperty(String property, Figure fig) {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- WindowFigure window = null;
- IconFigure icon = null;
- LinkFigure link = null;
- if (fig instanceof CompoundNodeFigure) {
- window = ((CompoundNodeFigure) fig).getWindowFigure();
- icon = ((CompoundNodeFigure) fig).getIconFigure();
- } else if (fig instanceof WindowFigure)
- window = (WindowFigure) fig;
- else if (fig instanceof LinkFigure)
- link = (LinkFigure) fig;
-
- if (property != null && property.equals(USE_SYSTEM_COLORS))
- // reload all properties - it's easiest
- property = null;
-
- if (property == null || SNAP_TO_GRID.equals(property)) {
- boolean b = store.getBoolean(SNAP_TO_GRID);
- WindowFigure.defaultGridEnabled = b;
-
- if (window != null)
- window.getGridLayer().setVisible(b);
- }
-
- if (property == null || GRID_WIDTH.equals(property)
- || GRID_HEIGHT.equals(property)) {
- Dimension d = new Dimension(store.getInt(GRID_WIDTH), store
- .getInt(GRID_HEIGHT));
- WindowFigure.defaultGridSpacing = d;
-
- if (window != null)
- window.getGridLayer().setSpacing(d);
- }
-
- if (property == null || GRID_COLOR.equals(property)) {
- Color c = getColor(store, GRID_COLOR);
- WindowFigure.defaultGridColor = c;
-
- if (window != null)
- window.getGridLayer().setForegroundColor(c);
- }
-
- // TODO: since the line router is managed by the EditPart for the
- // container figure, setting the line routing style in the WindowFigure
- // does not change the line routing immediately. The editor must be
- // restarted for line routing to take effect.
- if (property == null || LINE_ROUTING.equals(property)) {
- String s = store.getString(LINE_ROUTING);
- int style;
- if (LINE_ROUTING_MANHATTAN.equals(s))
- style = WindowFigure.LINE_ROUTING_MANHATTAN;
- else
- style = WindowFigure.LINE_ROUTING_MANUAL;
-
- WindowFigure.defaultLineRoutingStyle = style;
- if (window != null)
- window.setLineRoutingStyle(style);
- }
-
- if (property == null || LINE_WIDTH.equals(property)) {
- int w = store.getInt(LINE_WIDTH);
- LinkFigure.defaultLineWidth = w;
-
- if (link != null)
- link.setLineWidth(w);
- }
-
- if (property == null || LINE_COLOR.equals(property)) {
- Color c = getColor(store, LINE_COLOR);
- LinkFigure.defaultLineColor = c;
-
- if (link != null)
- link.setForegroundColor(c);
- }
-
- if (property == null || SHOW_LINE_LABELS.equals(property)) {
- boolean b = store.getBoolean(SHOW_LINE_LABELS);
- LinkFigure.defaultLabelVisible = b;
-
- if (link != null)
- link.setLabelVisible(b);
- }
-
- if (property == null || LINE_LABEL_FONT.equals(property)
- || LINE_LABEL_FONT_COLOR.equals(property)) {
- // CR392586: resource leaks
- Font f = getFont(store, LINE_LABEL_FONT);
- Color c = getColor(store, LINE_LABEL_FONT_COLOR);
- LinkFigure.defaultFont = f;
- LinkFigure.defaultLabelForeground = c;
-
- if (link != null) {
- link.setFont(f);
- link.setLabelForeground(c);
- }
- }
-
- if (property == null || LINE_LABEL_COLOR.equals(property)) {
- Color c = getColor(store, LINE_LABEL_COLOR);
- LinkFigure.defaultLabelBackground = c;
-
- if (link != null)
- link.setLabelBackground(c);
- }
-
- if (property == null || CANVAS_COLOR.equals(property)) {
- Color c = getColor(store, CANVAS_COLOR);
- WindowFigure.defaultBackgroundColor = c;
-
- if (window != null)
- window.setBackgroundColor(c);
- if (icon != null)
- icon.setBackgroundColor(c);
- }
-
- if (property == null || INPUT_PORT_COLOR.equals(property)) {
- Color c = getColor(store, INPUT_PORT_COLOR);
- InputPortFigure.defaultForegroundColor = c;
-
- if (fig instanceof InputPortFigure)
- fig.setForegroundColor(c);
- }
-
- if (property == null || OUTPUT_PORT_COLOR.equals(property)) {
- Color c = getColor(store, OUTPUT_PORT_COLOR);
- OutputPortFigure.defaultForegroundColor = c;
-
- if (fig instanceof OutputPortFigure)
- fig.setForegroundColor(c);
- }
-
- if (property == null || FIGURE_LABEL_FONT.equals(property)
- || FIGURE_LABEL_FONT_COLOR.equals(property)) {
- // CR392586: resource leaks
- Font f = getFont(store, FIGURE_LABEL_FONT);
- Color c = getColor(store, FIGURE_LABEL_FONT_COLOR);
- IconFigure.defaultFont = f;
- IconFigure.defaultForegroundColor = c;
- WindowFigure.defaultFont = f;
- WindowFigure.defaultForegroundColor = c;
-
- if (window != null) {
- window.setFont(f);
- window.setForegroundColor(c);
- }
- if (icon != null) {
- icon.setFont(f);
- icon.setForegroundColor(c);
- }
- if (fig instanceof IconFigure) {
- fig.setFont(f);
- fig.setForegroundColor(c);
- }
- }
-
- if (property == null || LABEL_PLACEMENT.equals(property)) {
- int placement = PositionConstants.SOUTH;
- String s = store.getString(LABEL_PLACEMENT);
- if (LABEL_PLACEMENT_TOP.equals(s))
- placement = PositionConstants.NORTH;
- if (LABEL_PLACEMENT_BOTTOM.equals(s))
- placement = PositionConstants.SOUTH;
- if (LABEL_PLACEMENT_LEFT.equals(s))
- placement = PositionConstants.WEST;
- if (LABEL_PLACEMENT_RIGHT.equals(s))
- placement = PositionConstants.EAST;
- IconFigure.defaultTextPlacement = placement;
-
- if (icon != null)
- icon.setTextPlacement(placement);
- if (fig instanceof IconFigure)
- ((IconFigure) fig).setTextPlacement(placement);
- }
-
- Iterator iter = fig.getChildren().iterator();
- while (iter.hasNext()) {
- Figure child = (Figure) iter.next();
- propagateProperty(property, child);
- }
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java
deleted file mode 100644
index 16f6834bf..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Bob
- *
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public interface IBaseFigure extends IFigure {
- public abstract void setText(String text);
-
- public abstract String getText();
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public abstract Rectangle getTextBounds();
-
- public abstract void setIcon(Image image);
-
- public abstract Image getIcon();
-
- public abstract void setToolTipText(String text);
-
- public abstract String getToolTipText();
-
- public abstract void setHighlight(boolean flag);
-
- public abstract void addDecorator(BaseFigureDecorator decorator);
-
- public abstract void removeDecorator();
-
- public abstract void removeDecorator(int position);
-
- public abstract List getDecorators();
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java
deleted file mode 100644
index e627c5312..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.draw2d.Layer; /** * * @author bbrodt * * * * This class extends IBaseFigure by including a layer accessor. * */ public interface IContainerFigure extends IBaseFigure { public Layer getLayer(Object key); } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java
deleted file mode 100644
index 59ebdda1f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AncestorListener;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * And IconFigure consists of a bitmap image with a text label below it.
- *
- * @author bbrodt
- */
-public class IconFigure extends Label implements IBaseFigure {
- public static int defaultTextPlacement = PositionConstants.SOUTH;
-
- public static Font defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- public static Color defaultForegroundColor = ColorConstants.black;
-
- private ArrayList decorators;
-
- private IconLabel iconLabel = null;
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- // New class that implements a separate "floating" label which is NOT
- // included in bounds calculations for this IconFigure
- private class IconLabel extends Label {
- private LabelLocator locator;
-
- private IconFigure host;
-
- public IconLabel(IconFigure host, String text) {
- super(text);
- this.host = host;
- locator = new LabelLocator(this);
- }
-
- public IconFigure getHost() {
- return host;
- }
-
- public Dimension getPreferredSize(int wHint, int hHing) {
- return host.getTextBounds().getSize();
- }
-
- public void setText(String text) {
- super.setText(text);
- if (locator != null)
- locator.setConstraints();
- }
-
- public void invalidate() {
- if (locator != null)
- locator.setConstraints();
- super.invalidate();
- }
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- // helper class that relocates the IconLabel whenever ancestor is moved or
- // added/removed
- private class LabelLocator implements AncestorListener {
- IconLabel label;
-
- public LabelLocator(IconLabel label) {
- this.label = label;
- label.getHost().addAncestorListener(this);
- }
-
- // CR408950: BP Save problems
- // fixed icon label refresh problems
- private Layer getParentLayer() {
- IFigure fig = label.getHost();
- while (fig != null) {
- if (fig instanceof Layer)
- return (Layer) fig;
- fig = fig.getParent();
- }
- return null;
- }
-
- public void ancestorAdded(IFigure ancestor) {
- Layer layer = getParentLayer();
- if (layer != null && !layer.getChildren().contains(label)) {
- layer.add(label);
- setConstraints();
- }
- }
-
- public void ancestorMoved(IFigure ancestor) {
- setConstraints();
- }
-
- public void ancestorRemoved(IFigure ancestor) {
- // CR400779: GEM minimizing a complex activity sometimes leaves junk
- // on the screen
- if (label.getParent() != null
- && label.getParent().getChildren().contains(label))
- label.getParent().remove(label);
- }
-
- public void setConstraints() {
- Layer layer = getParentLayer();
- if (layer != null && layer.getLayoutManager() != null
- && layer.getChildren().contains(label)) {
- Rectangle r = IconFigure.this.getParent().getBounds().getCopy();
- r.translate(IconFigure.this.getBounds().getLocation());
- r.translate(IconFigure.this.getTextLocation());
- r.width = -1;
- r.height = -1;
- Rectangle oldr = (Rectangle) layer.getLayoutManager()
- .getConstraint(label);
- if (oldr == null || oldr.x != r.x || oldr.y != r.y)
- layer.setConstraint(label, r);
- }
- }
- }
-
- /**
- * @param s
- */
- public IconFigure(String name, Image icon) {
- super(name, icon);
- setTextPlacement(defaultTextPlacement);
- setOpaque(false);
- setIcon(icon);
- setIconTextGap(0);
- setForegroundColor(defaultForegroundColor);
- // CR396303: DND in RulePanel does not get correct location if viewer is
- // scrolled
- setBackgroundColor(ColorConstants.titleGradient);
- XYLayout layout = new XYLayout();
- setLayoutManager(layout);
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- iconLabel = new IconLabel(this, name);
- iconLabel.setFont(getFont());
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- public Label getLabel() {
- return iconLabel;
- }
-
- public List getDecorators() {
- if (decorators == null)
- decorators = new ArrayList();
- return decorators;
- }
-
- public Font getFont() {
- if (defaultFont == null)
- defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
- if (font == null)
- font = defaultFont;
- return font;
- }
-
- public void setFont(Font f) {
- if (font != f) {
- font = f;
- iconLabel.setFont(font);
- revalidate();
- }
- }
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- iconLabel.setVisible(visible);
- }
-
- public void setText(String text) {
- super.setText(text);
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- if (iconLabel != null && iconLabel.isVisible()) {
- iconLabel.setText(text);
- iconLabel.setFont(getFont());
- // labelLocator.setConstraints();
- }
- }
-
- public void setToolTipText(String text) {
- Label toolTip = null;
-
- if (text != null && text.length() > 0) {
- toolTip = new Label(text);
- toolTip.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTip);
- }
-
- public String getToolTipText() {
- if (getToolTip() != null)
- return ((Label) getToolTip()).getText();
- return null;
- }
-
- public void setHighlight(boolean flag) {
- if (flag)
- setOpaque(true);
- else
- setOpaque(false);
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- protected Dimension getSubStringTextSize() {
- return getTextSize();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated We must
- * override this so that the label gets truncated
- */
- public Dimension getPreferredSize(int wHint, int hHint) {
- if (prefSize == null) {
- super.getPreferredSize(-1, -1);
- prefSize.width = getIconBounds().getSize().width;
- Dimension minSize = getMinimumSize(wHint, hHint);
- if (prefSize.width < minSize.width)
- prefSize.width = minSize.width;
- if (prefSize.height < minSize.height)
- prefSize.height = minSize.height;
- }
- return prefSize;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#getMinimumSize(int, int)
- */
- public Dimension getMinimumSize(int w, int h) {
- return new Dimension(8, 8);
- }
-
- public void addDecorator(BaseFigureDecorator decorator) {
- removeDecorator(decorator.getPosition());
- getDecorators().add(decorator);
- add(decorator);
- invalidate();
- }
-
- public void removeDecorator() {
- removeDecorator(BaseFigureDecorator.DEFAULT_DECORATOR_POSITION);
- }
-
- public void removeDecorator(int position) {
- Iterator it = getDecorators().iterator();
- while (it.hasNext()) {
- BaseFigureDecorator d = (BaseFigureDecorator) it.next();
- if (d.getPosition() == position) {
- it.remove();
- remove(d);
- invalidate();
- break;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Label#setTextPlacement(int)
- */
- public void setTextPlacement(int where) {
- super.setTextPlacement(where);
- layout();
- invalidate();
- }
-
- public void invalidate() {
- // CR405873: F111-Error decorator missing
- // this was moved to paintFigure()
- // placeDecorators();
- super.invalidate();
- }
-
- private void placeDecorators() {
- Point o = getLocation();
- Point p = getIconBounds().getLocation();
- Dimension size = this.getIconBounds().getSize();
- Iterator it = getDecorators().iterator();
- while (it.hasNext()) {
- int x = p.x - o.x, y = p.y - o.y;
- BaseFigureDecorator decorator = (BaseFigureDecorator) it.next();
- Dimension decoratorSize = decorator.getPreferredSize();
- switch (decorator.getPosition()) {
- case (PositionConstants.CENTER | PositionConstants.MIDDLE):
- // CR378889: Case of decoration that should be right in the
- // middle.
- // Had to add a fudge factor because it's not exactly where I
- // want it.
- int fudge = 4;
- y += size.height / 2 - decoratorSize.height / 2 + fudge;
- x += size.width / 2 - decoratorSize.width / 2;
- break;
- case PositionConstants.NORTH:
- x += size.width / 2 - decoratorSize.width / 2;
- break;
- case PositionConstants.NORTH_EAST:
- x += size.width - decoratorSize.width;
- break;
- case PositionConstants.EAST:
- x += size.width - decoratorSize.width;
- y += size.height / 2 - decoratorSize.height / 2;
- break;
- case PositionConstants.SOUTH_EAST:
- x += size.width - decoratorSize.width;
- y += size.height - decoratorSize.height;
- break;
- case PositionConstants.SOUTH:
- x += size.width / 2 - decoratorSize.width / 2;
- y += size.height - decoratorSize.height;
- break;
- case PositionConstants.SOUTH_WEST:
- y += size.height - decoratorSize.height;
- break;
- case PositionConstants.WEST:
- y += size.height / 2 - decoratorSize.height / 2;
- break;
- case PositionConstants.NORTH_WEST:
- break;
- }
- getLayoutManager().setConstraint(decorator,
- new Rectangle(x, y, -1, -1));
- }
- layout();
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- protected void paintFigure(Graphics graphics) {
- if (isOpaque())
- super.paintFigure(graphics);
- // CR405873: F111-Error decorator missing
- placeDecorators();
- Rectangle bounds = getBounds();
- graphics.translate(bounds.x, bounds.y);
- if (getIcon() != null)
- graphics.drawImage(getIcon(), getIconLocation());
- if (iconLabel == null || !iconLabel.isVisible()) {
- if (!isEnabled()) {
- graphics.translate(1, 1);
- graphics.setForegroundColor(ColorConstants.buttonLightest);
- graphics.drawText(getSubStringText(), getTextLocation());
- graphics.translate(-1, -1);
- graphics.setForegroundColor(ColorConstants.buttonDarker);
- }
- graphics.drawText(getSubStringText(), getTextLocation());
- }
- graphics.translate(-bounds.x, -bounds.y);
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java
deleted file mode 100644
index f58ecc8c2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.draw2d.ColorConstants; import org.eclipse.swt.graphics.Color; /** * * Figure used to draw input ports * */ public class InputPortFigure extends PortFigure { public static Color defaultForegroundColor = ColorConstants.black; public static Color defaultBackgroundColor = ColorConstants.white; /** * * * */ public InputPortFigure() { super(FigureConstants.INPUT_PORT); setBackgroundColor(defaultBackgroundColor); setForegroundColor(defaultForegroundColor); } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java
deleted file mode 100644
index 761b7ee1b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.MidpointLocator;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Bob
- *
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public class LinkFigure extends PolylineConnection implements IBaseFigure {
- public static Color defaultLineColor = ColorConstants.black;
-
- public static int defaultLineWidth = 1;
-
- public static boolean defaultLabelVisible = false;
-
- public static Color defaultLabelForeground = ColorConstants.black;
-
- public static Color defaultLabelBackground = ColorConstants.white;
-
- public static Font defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- private LinkLabel label;
-
- public LinkFigure() {
- super();
- setLineWidth(defaultLineWidth);
- setForegroundColor(defaultLineColor);
-
- // BaseFigureDecorator decorator;
- // decorator = new
- // BaseFigureDecorator(GEMPlugin.getDefault().getGEMImage("delete.gif"),"target",PositionConstants.WEST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(GEMPlugin.getDefault().getGEMImage("delete.gif"),"target",PositionConstants.EAST);
- // addDecorator(decorator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText()
- */
- public void setToolTipText(String text) {
- Label toolTip = null;
-
- if (text != null && text.length() > 0) {
- toolTip = new Label(text);
- toolTip.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTip);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getToolTipText()
- */
- public String getToolTipText() {
- if (getToolTip() != null)
- return ((Label) getToolTip()).getText();
- return null;
- }
-
- public void setHighlight(boolean flag) {
- if (flag) {
- setForegroundColor(ColorConstants.titleBackground);
- // setLineWidth(defaultLineWidth * 2);
- } else {
- setForegroundColor(defaultLineColor);
- // setLineWidth(defaultLineWidth);
- }
- }
-
- public void setSelected(boolean flag) {
- if (flag) {
- // setForegroundColor(ColorConstants.titleBackground);
- setLineWidth(defaultLineWidth * 2);
- } else {
- // setForegroundColor(defaultLineColor);
- setLineWidth(defaultLineWidth);
- }
- }
-
- public void setLabelVisible(boolean flag) {
- getLabel().setVisible(flag);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setText()
- */
- public void setText(String text) {
- if (text == null && text.length() == 0) {
- if (label != null) {
- remove(label);
- label = null;
- }
- } else {
- getLabel().setText(text);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getText()
- */
- public String getText() {
- if (label == null)
- return null;
- return label.getText();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public Rectangle getTextBounds() {
- return label.getTextBounds();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setIcon(org.eclipse.swt.graphics.Image)
- */
- public void setIcon(Image image) {
- getLabel().setIcon(image);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getIcon()
- */
- public Image getIcon() {
- return getLabel().getIcon();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator)
- */
- public void addDecorator(BaseFigureDecorator decorator) {
- int pos = decorator.getPosition();
- if (pos == BaseFigureDecorator.DEFAULT_DECORATOR_POSITION
- || pos == PositionConstants.WEST
- || pos == PositionConstants.LEFT) {
- setTargetDecoration(decorator);
- } else if (pos == PositionConstants.EAST
- || pos == PositionConstants.RIGHT) {
- setSourceDecoration(decorator);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- removeDecorator(BaseFigureDecorator.DEFAULT_DECORATOR_POSITION);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(int position) {
- if (position == BaseFigureDecorator.DEFAULT_DECORATOR_POSITION)
- setTargetDecoration(null);
- else
- setSourceDecoration(null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getDecorators()
- */
- public List getDecorators() {
- List list = new ArrayList(2);
- Object d;
- d = getSourceDecoration();
- if (d != null)
- list.add(d);
- d = getTargetDecoration();
- if (d != null)
- list.add(d);
- return list;
- }
-
- public LinkLabel getLabel() {
- if (label == null) {
- label = new LinkLabel();
- add(label, new MidpointLocator(this, 0));
- }
- return label;
- }
-
- public void setLabelForeground(Color c) {
- getLabel().setForegroundColor(c);
- }
-
- public void setLabelBackground(Color c) {
- getLabel().setBackgroundColor(c);
- }
-
- public void setFont(Font f) {
- getLabel().setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Shape#setLineWidth(int)
- */
- public void setLineWidth(int w) {
- getLabel().setBorderWidth(w);
- super.setLineWidth(w);
- }
-
- public void setForegroundColor(Color c) {
- getLabel().setBorderColor(c);
- super.setForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Polyline#setPoints(org.eclipse.draw2d.geometry.PointList)
- */
- public void setPoints(PointList points) {
- // TODO Auto-generated method stub
- super.setPoints(points);
- if (label != null) {
- int i = getPoints().size() / 2 - 1;
- if (i < 0)
- i = 0;
- if (getLayoutManager() != null)
- getLayoutManager().setConstraint(label,
- new MidpointLocator(this, i));
- }
- }
-
- public Rectangle getBounds() {
- if (bounds == null) {
- if (bounds == null) {
- bounds = getPoints().getBounds().getExpanded(lineWidth / 2,
- lineWidth / 2);
- }
- // CR382243: Clicking on the node icon selects the connection line
- // rather than the node
- // NOTE: expanding the bounds to include children (in this case,
- // the Link labels) causes problems when the connection line becomes
- // short (i.e., when the 2 anchor figures at each end of the
- // connection are
- // close together) because the bounds of this link figure will be
- // greater
- // than the actual length of the line. This causes the link figure
- // to
- // be hit-tested beyond its visual size.
- if (getLabel().isVisible()) {
- for (int i = 0; i < getChildren().size(); i++) {
- IFigure child = (IFigure) getChildren().get(i);
- bounds.union(child.getBounds());
- }
- }
- }
- return bounds;
- }
-
- /*
- * Helper class for line labels.
- */
- public class LinkLabel extends Label {
- public LinkLabel() {
- setBorder(new LineBorder());
- setOpaque(true);
- setForegroundColor(defaultLabelForeground);
- setBackgroundColor(defaultLabelBackground);
- setFont(defaultFont);
- LineBorder border = new LineBorder(defaultLineWidth);
- setBorder(border);
- border.setColor(defaultLineColor);
- setVisible(defaultLabelVisible);
- }
-
- public void setBorderWidth(int w) {
- ((LineBorder) getBorder()).setWidth(w);
- }
-
- public void setBorderColor(Color c) {
- ((LineBorder) getBorder()).setColor(c);
- }
-
- protected boolean useLocalCoordinates() {
- return false;
- }
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java
deleted file mode 100644
index c6647c951..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Bob Brodt
- *
- * This is an XY layout that actually observes visiblity of children figures
- * when doint its layout.
- *
- * Apparently there is a bug in the GEF XYLayout class because it does not
- * observe visibility.
- *
- * @see AbstractLayout.isObservingVisibility()
- */
-public class ObserveVisibleXYLayout extends FreeformLayout {
- protected Dimension calculatePreferredSize(IFigure f, int wHint, int hHint) {
- Rectangle rect = new Rectangle();
- ListIterator children = f.getChildren().listIterator();
- while (children.hasNext()) {
- IFigure child = (IFigure) children.next();
- // bug fix
- if (isObservingVisibility() && !child.isVisible())
- continue;
- Rectangle r = (Rectangle) constraints.get(child);
- if (r == null)
- continue;
-
- if (r.width == -1 || r.height == -1) {
- Dimension preferredSize = child.getPreferredSize(r.width,
- r.height);
- r = r.getCopy();
- if (r.width == -1)
- r.width = preferredSize.width;
- if (r.height == -1)
- r.height = preferredSize.height;
- }
- rect.union(r);
- }
- Dimension d = rect.getSize();
- Insets insets = f.getInsets();
- return new Dimension(d.width + insets.getWidth(), d.height
- + insets.getHeight()).union(getBorderPreferredSize(f));
- }
-
- public void layout(IFigure parent) {
- Iterator children = parent.getChildren().iterator();
- Point offset = getOrigin(parent);
- IFigure f;
- while (children.hasNext()) {
- f = (IFigure) children.next();
- // bug fix
- if (isObservingVisibility() && !f.isVisible())
- continue;
- Rectangle bounds = (Rectangle) getConstraint(f);
- if (bounds == null)
- continue;
-
- if (bounds.width == -1 || bounds.height == -1) {
- Dimension preferredSize = f.getPreferredSize(bounds.width,
- bounds.height);
- bounds = bounds.getCopy();
- if (bounds.width == -1)
- bounds.width = preferredSize.width;
- if (bounds.height == -1)
- bounds.height = preferredSize.height;
- }
- bounds = bounds.getTranslated(offset);
- f.setBounds(bounds);
- }
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java
deleted file mode 100644
index e6ef854c1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.draw2d.ColorConstants; import org.eclipse.swt.graphics.Color; /** * */ public class OutputPortFigure extends PortFigure { public static Color defaultForegroundColor = ColorConstants.black; public static Color defaultBackgroundColor = ColorConstants.white; /** * * * */ public OutputPortFigure() { super(FigureConstants.OUTPUT_PORT); setBackgroundColor(defaultBackgroundColor); setForegroundColor(defaultForegroundColor); } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java
deleted file mode 100644
index 02ef0f474..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import java.util.Iterator; import java.util.Vector; import org.eclipse.draw2d.AbstractConnectionAnchor; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PolylineConnection; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PrecisionPoint; import org.eclipse.draw2d.geometry.Rectangle; /** * */ public class PortConnectionAnchor extends AbstractConnectionAnchor { // CR386077: SplitActivity True and False outputs switch positions based on // their targets protected int orientation = PositionConstants.NONE; /** * * * */ public PortConnectionAnchor() { super(); // TODO Auto-generated constructor stub } /** * * @param owner * */ public PortConnectionAnchor(IFigure owner) { super(owner); } // CR386077: SplitActivity True and False outputs switch positions based on // their targets public int getOrientation() { return orientation; } public void setOrientation(int o) { orientation = o; ((PortFigure) getOwner()).setOrientation(orientation); } /* * * (non-Javadoc) * * * * @see org.eclipse.draw2d.ConnectionAnchor#getLocation(org.eclipse.draw2d.geometry.Point) * */ public Point getLocation(Point arg0) { PortFigure portFigure = (PortFigure) getOwner(); Point result = new Point(0, 0); Rectangle r = portFigure.getBounds(); switch (portFigure.getOrientation()) { case PositionConstants.NORTH: result = new PrecisionPoint(r.x + r.width / 2, r.y); break; case PositionConstants.SOUTH: result = new PrecisionPoint(r.x + r.width / 2, r.y + r.height); break; case PositionConstants.WEST: result = new PrecisionPoint(r.x, r.y + r.height / 2); break; case PositionConstants.EAST: result = new PrecisionPoint(r.x + r.width, r.y + r.height / 2); break; } portFigure.translateToAbsolute(result); return result; } public Vector getConnections() { Vector list = new Vector(); Iterator it = listeners.iterator(); while (it.hasNext()) { Object listener = it.next(); if (listener instanceof PolylineConnection) list.add(listener); } return list; } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java
deleted file mode 100644
index 0c5996ed1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java
+++ /dev/null
@@ -1 +0,0 @@
-/******************************************************************************* * Copyright (c) 2004, 2006 Sybase, Inc. and others. * * All rights reserved. This program and the accompanying materials * are 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: * Sybase, Inc. - initial API and implementation *******************************************************************************/ package org.eclipse.jst.jsf.facesconfig.ui.preference; import org.eclipse.draw2d.Figure; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.Label; import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Insets; import org.eclipse.draw2d.geometry.PointList; import org.eclipse.draw2d.geometry.Rectangle; /** * * Provides the base implementation for all the port figures. * */ public class PortFigure extends Figure { private boolean showBox = false; private boolean showArrow = true; // orientation is one of the four positions constants // NORTH, SOUTH, EAST or WEST and indicates on which side // of the parent figure the connection anchor figure is // located. private int orientation = PositionConstants.WEST; // type is the port type; either input or output private int type = FigureConstants.INPUT_PORT; /** * * Construct a port figure. * */ public PortFigure(int type) { super(); this.type = type; setOpaque(false); } /** * * @param b * */ public void setBoxVisible(boolean b) { showBox = b; repaint(); } public void setArrowVisible(boolean b) { showArrow = b; repaint(); } /** * * @return Returns the type. * */ public int getType() { return type; } /** * * @param type * The type to set. * */ public void setType(int type) { this.type = type; } public void setOrientation(int o) { orientation = o; } public int getOrientation() { return orientation; } public void setToolTipText(String text) { setToolTip(new Label(text)); } public String getToolTipText() { IFigure fig = getToolTip(); if (fig instanceof Label) return ((Label) fig).getText(); return null; } /* * * (non-Javadoc) * * * * @see org.eclipse.draw2d.IFigure#paint(org.eclipse.draw2d.Graphics) * */ public void paintFigure(Graphics g) { super.paintFigure(g); Rectangle bounds = getBounds(); g.setForegroundColor(getForegroundColor()); if (showBox) { // draw outer rectangle g.setBackgroundColor(getBackgroundColor()); g.fillRectangle(getBounds().getCropped(new Insets(0, 1, 1, 0))); Rectangle r = getBounds().getExpanded(-1, -1).getTranslated(0, -1); r.height += 1; g.drawRectangle(r); } if (showArrow) { // draw arrowhead g.setBackgroundColor(getForegroundColor()); PointList pts = new PointList(); if (type == FigureConstants.INPUT_PORT) { switch (orientation) { case PositionConstants.NORTH: pts.addPoint(bounds.getTopLeft()); pts.addPoint(bounds.getTopRight()); pts.addPoint(bounds.getBottom()); pts.addPoint(bounds.getTopLeft()); break; case PositionConstants.SOUTH: pts.addPoint(bounds.getBottomLeft()); pts.addPoint(bounds.getTop()); pts.addPoint(bounds.getBottomRight()); pts.addPoint(bounds.getBottomLeft()); break; case PositionConstants.EAST: pts.addPoint(bounds.getTopRight()); pts.addPoint(bounds.getBottomRight()); pts.addPoint(bounds.getLeft()); pts.addPoint(bounds.getTopRight()); break; case PositionConstants.WEST: pts.addPoint(bounds.getTopLeft()); pts.addPoint(bounds.getRight()); pts.addPoint(bounds.getBottomLeft()); pts.addPoint(bounds.getTopLeft()); break; } } else { switch (orientation) { case PositionConstants.NORTH: pts.addPoint(bounds.getBottomLeft()); pts.addPoint(bounds.getTop()); pts.addPoint(bounds.getBottomRight()); pts.addPoint(bounds.getBottomLeft()); break; case PositionConstants.SOUTH: pts.addPoint(bounds.getTopLeft()); pts.addPoint(bounds.getTopRight()); pts.addPoint(bounds.getBottom()); pts.addPoint(bounds.getTopLeft()); break; case PositionConstants.EAST: pts.addPoint(bounds.getTopLeft()); pts.addPoint(bounds.getRight()); pts.addPoint(bounds.getBottomLeft()); pts.addPoint(bounds.getTopLeft()); break; case PositionConstants.WEST: pts.addPoint(bounds.getTopRight()); pts.addPoint(bounds.getBottomRight()); pts.addPoint(bounds.getLeft()); pts.addPoint(bounds.getTopRight()); break; } } g.fillPolygon(pts); g.drawPolyline(pts); } } /* * * (non-Javadoc) * * * * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int) * */ public Dimension getPreferredSize(int wHint, int hHint) { Dimension d = new Dimension(FigureConstants.PORT_SIDE, FigureConstants.PORT_SIDE); // CR389070: Figures are abbreviating rule figures names and making them // unreadable // anchor size is now determined by the size of the owning figure icon if (getParent() instanceof BaseNodeFigure) { IBaseFigure fig = ((BaseNodeFigure) getParent()).getBaseFigure(); if (fig != null && fig.getIcon() != null) { org.eclipse.swt.graphics.Rectangle r = fig.getIcon() .getBounds(); if (r.width < 40) d.width /= 2; if (r.height < 40) d.height /= 2; } } return d; } } \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java
deleted file mode 100644
index 001df5f25..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class PreferenceMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.preference.PreferenceMessages";
-
- private PreferenceMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, PreferenceMessages.class);
- }
-
- public static String CanvasPreferenceTab_LABEL_UseSystemColors;
-
- public static String CanvasPreferenceTab_LABEL_BackgroundColor;
-
- public static String CanvasPreferenceTab_LABEL_Canvas;
-
- public static String CanvasPreferenceTab_LABEL_GridHeight;
-
- public static String CanvasPreferenceTab_LABEL_GridLineColor;
-
- public static String CanvasPreferenceTab_LABEL_GridWidth;
-
- public static String CanvasPreferenceTab_LABEL_IconLabelFont;
-
- public static String CanvasPreferenceTab_LABEL_IconGroup;
-
- public static String CanvasPreferenceTab_LABEL_InputPortColor;
-
- public static String CanvasPreferenceTab_LABEL_OutputPortColor;
-
- public static String CanvasPreferenceTab_LABEL_LineGroup;
-
- public static String CanvasPreferenceTab_LABEL_LineColor;
-
- public static String CanvasPreferenceTab_LABEL_ShowLineLabels;
-
- public static String CanvasPreferenceTab_LABEL_LineLabelColor;
-
- public static String CanvasPreferenceTab_LABEL_LineLabelFont;
-
- public static String CanvasPreferenceTab_LABEL_LineRouting;
-
- public static String CanvasPreferenceTab_LABEL_LineWidth;
-
- public static String CanvasPreferenceTab_LABEL_SnapToGeometry;
-
- public static String CanvasPreferenceTab_LABEL_SnapToGrid;
-
- public static String CanvasPreferenceTab_LABEL_UndoStackSize;
-
- public static String CanvasPreferences_LABEL_Direct;
-
- public static String CanvasPreferences_LABEL_Manhattan;
-
- public static String CanvasPreferences_LABEL_Manual;
-
- public static String CanvasPreferenceTab_LABEL_LabelPlacement;
-
- public static String CanvasPreferences_LABEL_Top;
-
- public static String CanvasPreferences_LABEL_Bottom;
-
- public static String CanvasPreferences_LABEL_Left;
-
- public static String CanvasPreferences_LABEL_Right;
-
- public static String CanvasPreferenceTab_LABEL_IconSize;
-
- public static String CanvasPreferences_LABEL_Small;
-
- public static String CanvasPreferences_LABEL_Medium;
-
- public static String CanvasPreferences_LABEL_Large;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties
deleted file mode 100644
index e03d9385e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Appearance preference labels
-#
-CanvasPreferenceTab_LABEL_UseSystemColors=Use System colors
-CanvasPreferenceTab_LABEL_BackgroundColor=Background color:
-CanvasPreferenceTab_LABEL_Canvas=Canvas
-CanvasPreferenceTab_LABEL_GridHeight=Grid height:
-CanvasPreferenceTab_LABEL_GridLineColor=Grid color:
-CanvasPreferenceTab_LABEL_GridWidth=Grid width:
-CanvasPreferenceTab_LABEL_IconLabelFont=Label font:
-CanvasPreferenceTab_LABEL_IconGroup=Icons
-CanvasPreferenceTab_LABEL_InputPortColor=Input Port color:
-CanvasPreferenceTab_LABEL_OutputPortColor=Output Port color:
-CanvasPreferenceTab_LABEL_LineGroup=Connection Lines
-CanvasPreferenceTab_LABEL_LineColor=Line color:
-CanvasPreferenceTab_LABEL_ShowLineLabels=Show labels
-CanvasPreferenceTab_LABEL_LineLabelColor=Label color:
-CanvasPreferenceTab_LABEL_LineLabelFont=Label font:
-CanvasPreferenceTab_LABEL_LineRouting=Line Routing:
-CanvasPreferenceTab_LABEL_LineWidth=Line width:
-CanvasPreferenceTab_LABEL_SnapToGeometry=Snap to geometry
-CanvasPreferenceTab_LABEL_SnapToGrid=Snap to grid
-CanvasPreferenceTab_LABEL_UndoStackSize="Undo\" stack size:
-CanvasPreferences_LABEL_Direct=Direct
-CanvasPreferences_LABEL_Manhattan=Manhattan
-CanvasPreferences_LABEL_Manual=Manual
-CanvasPreferenceTab_LABEL_LabelPlacement=Label Placement:
-CanvasPreferences_LABEL_Top=Top
-CanvasPreferences_LABEL_Bottom=Bottom
-CanvasPreferences_LABEL_Left=Left
-CanvasPreferences_LABEL_Right=Right
-CanvasPreferenceTab_LABEL_IconSize=Icon Size:
-CanvasPreferences_LABEL_Small=Small
-CanvasPreferences_LABEL_Medium=Medium
-CanvasPreferences_LABEL_Large=Large
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java
deleted file mode 100644
index 1a870f19e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-
-/**
- * This is a printable layer that draws page outline tiles enclosing all of the
- * printable child figures. The page outlines represent complete pages as they
- * would appear if they were printed on dead trees, thus the pageSize set on
- * this layer should be the currently selected printer's page resolution.
- *
- * The reason this needs to be added to the printable layers is so that it will
- * show up in the content outline viewer.
- */
-public class PrintedPageLayer extends FreeformLayer {
- // our layer name
- public static final String PRINTED_PAGE_LAYER = "Printed Page";
-
- // the size of the page tiles (this should be the printer's resolution)
- protected Dimension pageSize = new Dimension(850, 1100);
-
- // the WindowFigure that owns this layer
- private final WindowFigure host;
-
- // flag to lock out multiple calls to setFreeformBounds() when adding
- // and removing PrintedPageFigures.
- private boolean busy;
-
- // A simple page outline figure. We can get fancy later with turned-up
- // dogears, page numbers, titles and whatnot...
- class PrintedPageFigure extends RectangleFigure {
- PrintedPageFigure() {
- super();
- setFill(false);
- setOutline(true);
- setLineWidth(1);
- }
- }
-
- public PrintedPageLayer(WindowFigure figure) {
- super();
- this.host = figure;
- }
-
- protected PrintedPageFigure createPage(int x, int y) {
- PrintedPageFigure page = new PrintedPageFigure();
- page.setBounds(new Rectangle(x, y, pageSize.width, pageSize.height));
- return page;
- }
-
- /**
- * Sets the page width and height. This should be the currently selected
- * printer's page size.
- *
- * @param d
- */
- public void setPageSize(Dimension d) {
- pageSize = d.getCopy();
- }
-
- /**
- * @see FreeformFigure#setFreeformBounds(Rectangle)
- */
- public void setFreeformBounds(Rectangle bounds) {
- if (!busy && getParent() instanceof FreeformLayeredPane
- && pageSize.width > 0 && pageSize.height > 0) {
- busy = true;
-
- // build the new printing layer extent by looking at only the
- // contents of the Primary, Connection and Feedback layers
- Rectangle b;
- FreeformLayer layer;
- layer = (FreeformLayer) host.getLayer(LayerConstants.PRIMARY_LAYER);
- b = layer.getFreeformExtent().getCopy();
- layer = (FreeformLayer) host
- .getLayer(LayerConstants.CONNECTION_LAYER);
- b = b.union(layer.getFreeformExtent());
- layer = (FreeformLayer) host
- .getLayer(LayerConstants.FEEDBACK_LAYER);
- b = b.union(layer.getFreeformExtent());
-
- // calculate x and y for the page tiles
- int x = 0, y = 0;
- if (b.x < 0) {
- while (x > b.x)
- x -= pageSize.width;
- } else {
- while (x + pageSize.width < b.x)
- x += pageSize.width;
- }
- if (b.y < 0) {
- while (y > b.y)
- y -= pageSize.height;
- } else {
- while (y + pageSize.height < b.y)
- y += pageSize.height;
- }
-
- // get list of pagefigures that intersect the new extent
- // and a list of those that don't
- List keepers = new ArrayList();
- List trash = new ArrayList();
- Iterator iter = getChildren().iterator();
- while (iter.hasNext()) {
- Figure child = (Figure) iter.next();
- if (child.getBounds().intersects(b))
- keepers.add(child);
- else
- trash.add(child);
- }
-
- // calculate width and height
- int w = 0, h = 0;
- while (x + w < b.x + b.width)
- w += pageSize.width;
- while (y + h < b.y + b.height)
- h += pageSize.height;
-
- // determine the required pagefigures
- for (int xi = x; xi < x + w; xi += pageSize.width) {
- for (int yi = y; yi < y + h; yi += pageSize.height) {
- boolean found = false;
- iter = keepers.iterator();
- while (iter.hasNext()) {
- Figure child = (Figure) iter.next();
- Point p = child.getBounds().getLocation();
- if (p.x == xi && p.y == yi) {
- found = true;
- break;
- }
- }
- if (!found) {
- // add the new page
- add(createPage(xi, yi));
- }
- }
- }
-
- // remove all the old pages
- iter = trash.iterator();
- while (iter.hasNext())
- remove((Figure) iter.next());
-
- busy = false;
- }
- super.setFreeformBounds(bounds);
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java
deleted file mode 100644
index e8a5f9dcf..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-public class RectangleList extends Figure {
- protected List rectangles = new ArrayList();
-
- public RectangleList() {
- }
-
- public void addRectangle(int x1, int y1, int x2, int y2) {
- rectangles.add(new Rectangle(x1, y1, x2 - x1, y2 - y1));
- }
-
- public List getRectangles() {
- return rectangles;
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java
deleted file mode 100644
index d96127bed..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.draw2d.SchemeBorder;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.ListenerList;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Composite;
-
-public class TabbedTitleBarBorder extends SchemeBorder {
- // private int state = CompoundFigureListener.RESTORED;
-
- private IFigure parent;
-
- private ListenerList listenerList;
-
- private List tabList;
-
- private int currentTab;
-
- private Font font;
-
- private boolean visible = true;
-
- // from TitleBarBorder:
- private Color textColor = ColorConstants.black;
-
- private Color bgColor = ColorConstants.menuBackground;
-
- private Insets insets;
-
- private Insets padding = new Insets(2, 2, 2, 2);
-
- /**
- * Constructs a TitleBarBorder with its label set to the name of this class.
- *
- * @since 2.0
- */
- public TabbedTitleBarBorder(final IFigure parent) {
- super(SCHEMES.LOWERED);
-
- this.parent = parent;
-
- parent.addMouseListener(new MouseListener() {
- public void mousePressed(MouseEvent me) {
- Insets padding = getPadding();
- Point mp = me.getLocation();
- mp.x -= padding.left;
- mp.y -= padding.top + 3; // 3==width of the outer border
- Point pp = parent.getBounds().getLocation();
- Rectangle tr = new Rectangle(pp.x, pp.y, 0, 0);
- int activeIndex = -1;
-
- for (int i = 0; i < getTabList().size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- Dimension d = t.getTextExtents();
- d.height += padding.top + padding.bottom;
- d.width += padding.left;
- tr.setSize(d);
- if (tr.contains(mp)) {
- setCurrentTab(i);
- return;
- }
- tr.x += d.width;
- }
- }
-
- public void mouseReleased(MouseEvent me) {
- }
-
- public void mouseDoubleClicked(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
- });
- }
-
- protected List getTabList() {
- if (tabList == null)
- tabList = new ArrayList();
- return tabList;
- }
-
- public int addTab(String text) {
- getTabList().add(new Tab(text));
- return getTabList().size() - 1;
- }
-
- public void removeTab(int index) {
- if (index >= 0 && index < getTabList().size()) {
- tabList.remove(index);
- if (index >= tabList.size())
- index = tabList.size() - 1;
- setCurrentTab(index);
- }
- }
-
- public void setCurrentTab(int newIndex) {
- if (newIndex >= 0 && newIndex < getTabList().size()) {
- Tab newTab = (Tab) tabList.get(newIndex);
- int oldIndex = -1;
- for (int i = 0; i < tabList.size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- if (t.isActive()) {
- oldIndex = i;
- t.setActive(false);
- break;
- }
- }
- newTab.setActive(true);
- if (parent != null) {
- parent.invalidate();
- parent.repaint();
- }
- currentTab = newIndex;
- fireTabChanged(oldIndex, newIndex);
- }
- }
-
- public int getCurrentTab() {
- return currentTab;
- }
-
- public Object getContents(int index) {
- if (index >= 0 && index < getTabList().size())
- return ((Tab) tabList.get(index)).getContents();
- return null;
- }
-
- public void setContents(int index, Object contents) {
- if (index >= 0 && index < getTabList().size())
- ((Tab) tabList.get(index)).setContents(contents);
- }
-
- public void addTabbedWindowListener(WindowFigureListener listener) {
- if (listenerList == null)
- listenerList = new ListenerList();
- listenerList.add(listener);
- }
-
- public void removeTabbedWindowListener(WindowFigureListener listener) {
- if (listenerList != null)
- listenerList.remove(listener);
- }
-
- public Object[] getListeners() {
- return listenerList.getListeners();
- }
-
- protected void fireTabChanged(int oldIndex, int newIndex) {
- Object l[] = listenerList.getListeners();
- for (int i = 0; i < l.length; ++i) {
- if (l[i] instanceof WindowFigureListener)
- ((WindowFigureListener) l[i]).tabChanged(oldIndex, newIndex);
- }
- }
-
- /**
- * @return Returns the font.
- */
- public Font getFont() {
- if (font == null) {
- font = parent.getFont();
- if (font == null)
- font = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
- }
- return font;
- }
-
- /**
- * @param font
- * The font to set.
- */
- public void setFont(Font font) {
- this.font = font;
- invalidate();
- }
-
- /**
- * @return Returns the insets.
- */
- public Insets getInsets() {
- return insets;
- }
-
- public void setTextColor(Color c) {
- textColor = c;
- }
-
- public Color getTextColor() {
- return textColor;
- }
-
- public void setBackgroundColor(Color c) {
- bgColor = c;
- }
-
- public Color getBackgroundColor() {
- return bgColor;
- }
-
- public void setPadding(Insets p) {
- padding = p;
- invalidate();
- }
-
- public Insets getPadding() {
- return padding;
- }
-
- public void setLabel(String text) {
- setLabel(currentTab, text);
- }
-
- public void setLabel(int index, String text) {
- if (index >= 0 && index < getTabList().size())
- ((Tab) tabList.get(index)).setLabel(text);
- }
-
- public String getLabel() {
- return getLabel(currentTab);
- }
-
- public String getLabel(int index) {
- if (index >= 0 && index < getTabList().size())
- return ((Tab) tabList.get(index)).getLabel();
- return "";
- }
-
- public IFigure getParent() {
- return parent;
- }
-
- public void invalidate() {
- insets = null;
- for (int i = 0; i < getTabList().size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- t.invalidate();
- }
- }
-
- public Dimension getTextExtents(IFigure f) {
- Dimension d = new Dimension(0, 0);
- for (int i = 0; i < getTabList().size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- if (d.height == 0)
- d = t.getTextExtents();
- else
- d.width += t.getTextExtents().width;
- }
- return d;
- }
-
- /**
- * Sets the min/max buttons visible
- *
- * @param flag -
- * if true, buttons are made visible.
- */
- public void setVisible(boolean flag) {
- visible = flag;
- }
-
- /**
- * Calculates and returns the Insets for this border.
- *
- * @param pane
- * the pane on which Insets calculations are based
- * @return the calculated Insets
- * @since 2.0
- */
- protected Insets calculateInsets(IFigure figure) {
- insets = new Insets(super.getInsets(figure));
- insets.top = getTextExtents(figure).height;
- return insets;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
- */
- public Insets getInsets(IFigure figure) {
- if (insets == null)
- calculateInsets(figure);
- return insets;
- }
-
- /**
- * @see Border#paint(IFigure, Graphics, Insets)
- */
- public void paint(IFigure figure, Graphics g, Insets in) {
- if (!visible)
- return;
-
- Insets is = new Insets(in);
- getInsets(figure);
- is.top += insets.top;
- super.paint(figure, g, is);
- // Insets insets = getInsets(pane);
- // Insets padding = getPadding();
- // Insets in = new Insets(figureInsets);
- // in.top += insets.top;
- // super.paint(pane, g, in);
-
- tempRect.setBounds(getPaintRectangle(figure, in));
- Rectangle r = tempRect;
- r.height = Math.min(r.height, getTextExtents(figure).height);
-
- g.clipRect(r);
- g.setBackgroundColor(getBackgroundColor());
- g.fillRectangle(r);
- int x = r.x;
- int y = r.y;
-
- Iterator iter = getTabList().iterator();
- while (iter.hasNext()) {
- Tab t = (Tab) iter.next();
- t.paint(g, figure, x, y);
- x += t.getTextExtents().width;
- }
-
- g.setBackgroundColor(getBackgroundColor());
- }
-
- public Dimension getMinimumSize(int wHint, int hHint) {
- Dimension d = getTextExtents(parent);
- Insets i = getInsets(parent);
- d.expand(insets.left + insets.right, insets.top + insets.bottom);
- // add enough width for the min/max buttons
- // d.width += minButton.getSize().width + maxButton.getSize().width;
- return d;
- }
-
- private class Tab {
- private String label = "";
-
- private Object contents = null;
-
- private Dimension textExtents;
-
- private boolean active;
-
- public Tab(String text) {
- this.label = text;
- }
-
- public void setContents(Object contents) {
- this.contents = contents;
- }
-
- public Object getContents() {
- return contents;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
- public boolean isActive() {
- return active;
- }
-
- public String getLabel() {
- return label;
- }
-
- public void setLabel(String text) {
- if (text == null)
- this.label = "";
- else
- this.label = text;
- textExtents = null;
- }
-
- public Dimension calculateTextExtents() {
- textExtents = FigureUtilities.getTextExtents(label == null ? "W"
- : label, getFont());
- textExtents.width += getPadding().getWidth();
- textExtents.height += getPadding().getHeight();
- return textExtents;
- }
-
- public Dimension getTextExtents() {
- if (textExtents == null)
- calculateTextExtents();
- return textExtents.getCopy();
- }
-
- public void invalidate() {
- textExtents = null;
- }
-
- public void paint(Graphics g, IFigure f, int x, int y) {
- if (contents instanceof Composite) {
- return;
- }
- IFigure pane = (IFigure) contents;
- getTextExtents();
-
- Insets p = getPadding();
- int w = textExtents.width;
- int h = textExtents.height;
- int radius = Math.max(p.getWidth(), p.getHeight()) + 2;
-
- // CR408950: BP Save problems
- // fixed icon label refresh problems
- if (getTabList().size() > 1) {
- // only draw tabList if there are more than 1
- if (active)
- g.setBackgroundColor(pane == null ? ColorConstants.white
- : pane.getBackgroundColor());
- else
- g.setBackgroundColor(getBackgroundColor());
-
- --w;
- g.setForegroundColor(active ? ColorConstants.buttonDarkest
- : ColorConstants.buttonDarker);
- // g.setForegroundColor(ColorConstants.red);
- g.drawRectangle(x, y + h / 2, w, h);
- // g.setBackgroundColor(ColorConstants.green);
- g.fillRoundRectangle(new Rectangle(x, y, w, h), radius, radius);
- // g.setForegroundColor(ColorConstants.blue);
- g.drawRoundRectangle(new Rectangle(x, y, w, h), radius, radius);
- // g.setBackgroundColor(ColorConstants.yellow);
- g.fillRectangle(x + 1, y + h / 2, w - 1, h);
- } else
- g.setBackgroundColor(getBackgroundColor());
-
- g.setFont(getFont());
- g.setForegroundColor(getTextColor());
- if (label != null)
- g.drawString(label, x + padding.left + 1, y + padding.top);
- }
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java
deleted file mode 100644
index 66b0f1876..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.FrameBorder;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SchemeBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-public class TabbedWindowBorder extends FrameBorder {
- private boolean isVisible = true;
-
- // CR392586: resource leaks
- private static MySchemeBorder normalBorder = new MySchemeBorder(
- new MySchemeBorder.MyScheme(
- new Color[] { ColorConstants.button,
- ColorConstants.buttonLightest,
- ColorConstants.button },
- new Color[] { ColorConstants.buttonDarkest,
- ColorConstants.buttonDarker, ColorConstants.button }));
-
- // CR392586: resource leaks
- private static MySchemeBorder highlightBorder = new MySchemeBorder(
- new MySchemeBorder.MyScheme(new Color[] {
- FigureUtilities.lighter(ColorConstants.titleBackground),
- ColorConstants.titleBackground,
- FigureUtilities.darker(ColorConstants.titleBackground) },
- new Color[] {
- FigureUtilities
- .darker(ColorConstants.titleGradient),
- ColorConstants.titleGradient,
- FigureUtilities
- .lighter(ColorConstants.titleGradient) }));
-
- public static class MySchemeBorder extends SchemeBorder {
- public static class MyScheme extends SchemeBorder.Scheme {
- public MyScheme(Color[] highlight, Color[] shadow) {
- super(highlight, shadow);
- }
-
- public Color[] getHighlight() {
- return super.getHighlight();
- }
-
- public Color[] getShadow() {
- return super.getHighlight();
- }
- };
-
- MySchemeBorder(MyScheme scheme) {
- super(scheme);
- }
-
- public MyScheme getMyScheme() {
- return (MyScheme) super.getScheme();
- }
-
- /**
- * @see Border#paint(IFigure, Graphics, Insets)
- */
- public void paint(Composite comp, GC gc, Insets insets) {
- Color[] tl = getMyScheme().getHighlight();
- Color[] br = getMyScheme().getShadow();
- paint(comp, gc, insets, tl, br);
- }
-
- /**
- * Paints the border using the information in the set Scheme and the
- * inputs given. Side widths are determined by the number of colors in
- * the Scheme for each side.
- *
- * @param graphics
- * the graphics object
- * @param fig
- * the figure this border belongs to
- * @param insets
- * the insets
- * @param tl
- * the highlight (top/left) colors
- * @param br
- * the shadow (bottom/right) colors
- */
- protected void paint(Composite comp, GC gc, Insets insets, Color[] tl,
- Color[] br) {
- org.eclipse.swt.graphics.Rectangle rect = comp.getBounds();
-
- gc.setLineWidth(1);
- gc.setLineStyle(SWT.LINE_SOLID);
- gc.setXORMode(false);
-
- int top = rect.y - insets.top;
- int left = rect.x - insets.left;
- int bottom = rect.y + rect.height + insets.bottom;
- int right = rect.x + rect.width + insets.right;
- gc.setClipping(new org.eclipse.swt.graphics.Rectangle(left, top,
- right - left, bottom - top));
-
- Color color = new Color(Display.getDefault(), new RGB(255, 0, 0));
- gc.setForeground(color);
- gc.drawLine(left, top, right, bottom);
-
- for (int i = 0; i < br.length; i++) {
- // color = br[i];
- gc.setForeground(color);
- gc.drawLine(right - i, bottom - i, right - i, top + i);
- gc.drawLine(right - i, bottom - i, left + i, bottom - i);
- }
-
- right--;
- bottom--;
-
- for (int i = 0; i < tl.length; i++) {
- // color = tl[i];
- gc.setForeground(color);
- gc.drawLine(left + i, top + i, right - i, top + i);
- gc.drawLine(left + i, top + i, left + i, bottom - i);
- }
- color.dispose();
- }
- }
-
- public TabbedWindowBorder(IFigure parent) {
- // apparently paint() gets called before createBorders() has had
- // a chance to create the borders, so we just create them here
- inner = new TabbedTitleBarBorder(parent);
- outer = normalBorder;
- }
-
- public void setVisible(boolean flag) {
- if (isVisible != flag) {
- isVisible = flag;
- ((TabbedTitleBarBorder) inner).setVisible(flag);
- if (flag)
- ((TabbedTitleBarBorder) inner).getParent().repaint();
- }
- }
-
- public void setHighlight(boolean flag) {
- if (flag)
- outer = highlightBorder;
- else
- outer = normalBorder;
- ((TabbedTitleBarBorder) inner).getParent().repaint();
- }
-
- protected void createBorders() {
- }
-
- public void paint(IFigure figure, Graphics g, Insets insets) {
- if (isVisible) {
- if (comp != null) {
- GC gc = new GC(comp);
- paint(comp, gc, insets);
- gc.dispose();
- } else
- super.paint(figure, g, insets);
- }
- }
-
- private Composite comp;
-
- public void paint(Composite comp, GC gc, Insets insets) {
- this.comp = comp;
- if (isVisible)
- ((MySchemeBorder) outer).paint(comp, gc, insets);
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java
deleted file mode 100644
index d4d7a51dd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ActionEvent;
-import org.eclipse.draw2d.ActionListener;
-import org.eclipse.draw2d.Button;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-
-public class TitleBarButton extends Button {
- boolean state = false;
-
- Image uncheckedImage;
-
- Image checkedImage;
-
- Image uncheckedHiliteImage;
-
- Image checkedHiliteImage;
-
- RectangleList uncheckedRects;
-
- RectangleList checkedRects;
-
- boolean hilite = false;
-
- public TitleBarButton(Image image) {
- this(image, null, null, null);
- }
-
- public TitleBarButton(Image unchecked, Image uncheckedHilite,
- Image checked, Image checkedHilite) {
- super();
- uncheckedImage = unchecked;
- if (uncheckedHilite == null)
- uncheckedHiliteImage = unchecked;
- else
- uncheckedHiliteImage = uncheckedHilite;
- if (checked == null)
- checkedImage = unchecked;
- else
- checkedImage = checked;
- if (checkedHilite == null)
- checkedHiliteImage = unchecked;
- else
- checkedHiliteImage = checkedHilite;
- initialize();
- }
-
- public TitleBarButton(RectangleList rects) {
- super();
- uncheckedRects = rects;
- initialize();
- }
-
- public TitleBarButton(RectangleList unchecked, RectangleList checked) {
- super();
- uncheckedRects = unchecked;
- checkedRects = checked;
- initialize();
- }
-
- public boolean getState() {
- return state;
- }
-
- public void setState(boolean newState) {
- state = newState;
- hilite = false;
- }
-
- private void initialize() {
- setRequestFocusEnabled(true);
- setFocusTraversable(true);
-
- if (uncheckedImage != null) {
- org.eclipse.swt.graphics.Rectangle r = uncheckedImage.getBounds();
- setBounds(new Rectangle(0, 0, r.width, r.height));
- prefSize = new Dimension(r.width, r.height);
- } else {
- setForegroundColor(ColorConstants.black);
- setBackgroundColor(ColorConstants.white);
- calculatePreferredSize();
- setBounds(new Rectangle(0, 0, prefSize.width, prefSize.height));
- }
- setCursor(Cursors.ARROW);
- setBorder(null);
- setFont(JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT));
-
- addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setState(!state);
- }
- });
- this.addMouseMotionListener(new MouseMotionListener() {
-
- public void mouseDragged(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseEntered(MouseEvent me) {
- hilite = true;
- repaint();
- }
-
- public void mouseExited(MouseEvent me) {
- hilite = false;
- repaint();
- }
-
- public void mouseHover(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseMoved(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
- });
- }
-
- public Dimension calculatePreferredSize() {
- if (prefSize == null) {
- Rectangle rect = new Rectangle(0, 0, 0, 0);
- if (uncheckedRects != null) {
- Iterator iter = uncheckedRects.getRectangles().iterator();
- while (iter.hasNext()) {
- Point p = getLocation();
- Rectangle r = ((Rectangle) iter.next()).getCopy();
- rect = rect.getUnion(r);
- }
- }
- if (checkedRects != null) {
- Iterator iter = checkedRects.getRectangles().iterator();
- while (iter.hasNext()) {
- Point p = getLocation();
- Rectangle r = ((Rectangle) iter.next()).getCopy();
- rect = rect.getUnion(r);
- }
- }
- prefSize = rect.getSize();
- if (prefSize.width > prefSize.height)
- prefSize.height = prefSize.width;
- else if (prefSize.height > prefSize.width)
- prefSize.width = prefSize.height;
- prefSize.width += 4;
- prefSize.height += 4;
- }
- return prefSize;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#paint(org.eclipse.draw2d.Graphics)
- */
- public void paint(Graphics graphics) {
- if (!isVisible())
- return;
- if (uncheckedImage != null) {
- if (hilite) {
- if (state == false)
- graphics.drawImage(uncheckedHiliteImage, getLocation());
- else
- graphics.drawImage(checkedHiliteImage, getLocation());
- } else {
- if (state == false)
- graphics.drawImage(uncheckedImage, getLocation());
- else
- graphics.drawImage(checkedImage, getLocation());
- }
- } else {
- Iterator iter = null;
- if (state == false)
- iter = uncheckedRects.getRectangles().iterator();
- else
- iter = checkedRects.getRectangles().iterator();
- while (iter.hasNext()) {
- Point p = getLocation();
- Rectangle r = ((Rectangle) iter.next()).getCopy();
- r = r.translate(p.x, p.y);
- graphics.setForegroundColor(getForegroundColor());
- if (hilite)
- graphics.setBackgroundColor(ColorConstants.lightBlue);
- else
- graphics.setBackgroundColor(ColorConstants.white);
- graphics.fillRectangle(r);
- graphics.drawRectangle(r);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java
deleted file mode 100644
index fae603b70..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AncestorListener;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.FreeformViewport;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.draw2d.ScalableFreeformLayeredPane;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.GridLayer;
-import org.eclipse.gef.editparts.GuideLayer;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-public class WindowFigure extends ScrollPane implements IContainerFigure,
- LayerConstants, FreeformFigure {
- private TabbedWindowBorder windowBorder;
-
- private TabbedTitleBarBorder titleBarBorder;
-
- private FreeformViewport myViewport;
-
- // private FreeformLayeredPane layeredPane;
-
- private ScalableFreeformLayeredPane scaledLayers;
-
- private LayeredPane innerLayers;
-
- private LayeredPane printableLayers;
-
- private FreeformLayer primaryLayer;
-
- public static Font defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- public static Color defaultForegroundColor = ColorConstants.black;
-
- public static Color defaultBackgroundColor = ColorConstants.white;
-
- public static Color defaultGridColor = ColorConstants.lightGray;
-
- public static Dimension defaultGridSpacing = null;
-
- public static boolean defaultGridEnabled = false;
-
- // Line Routing is not used within the WindowFigure class; it just serves as
- // a storage
- // location for communicating between the GEMPreferences and EditParts that
- // actually
- // create the line routers.
- public static int LINE_ROUTING_MANUAL = 0;
-
- public static int LINE_ROUTING_MANHATTAN = 1;
-
- public static int defaultLineRoutingStyle = LINE_ROUTING_MANUAL;
-
- private class MyGridLayer extends GridLayer {
- public Point getOrigin() {
- return origin.getCopy();
- }
- }
-
- private class MyFeedbackLayer extends FreeformLayer {
- MyFeedbackLayer() {
- setEnabled(false);
- }
- }
-
- public WindowFigure() {
- super();
-
- windowBorder = new TabbedWindowBorder(this);
- titleBarBorder = (TabbedTitleBarBorder) windowBorder.getInnerBorder();
- setBorder(windowBorder);
- setFont(defaultFont);
- setForegroundColor(defaultForegroundColor);
- setBackgroundColor(defaultBackgroundColor);
-
- innerLayers = new FreeformLayeredPane();
- createLayers(innerLayers);
-
- myViewport = new FreeformViewport();
- myViewport.setContents(innerLayers);
-
- setViewport(myViewport);
-
- // CR389495: Working with nested complex activities causes in the BP
- // editor causes lockup
- // not related to this CR but discovered while working on it:
- // make sure we observe grid visibility from preferences
- getGridLayer().setVisible(defaultGridEnabled);
- getGridLayer().setSpacing(defaultGridSpacing);
- getGridLayer().setForegroundColor(defaultGridColor);
-
- setText("Window");
-
- addTabbedWindowListener(new WindowFigureListener() {
- public void tabChanged(int oldIndex, int newIndex) {
- internalSetCurrentTab(newIndex);
- validate();
- }
- });
- addAncestorListener(new AncestorListener() {
-
- public void ancestorAdded(IFigure ancestor) {
- setVisible(true);
- }
-
- public void ancestorMoved(IFigure ancestor) {
- // validateComposite();
- }
-
- public void ancestorRemoved(IFigure ancestor) {
- // TODO: fix this - shouldn't be throwing an exception
- try {
- setVisible(false);
- } catch (Exception e) {
- }
- }
- });
- }
-
- // //////////////////////////////////////////////////////////////////////////
- // Layer management
- // //////////////////////////////////////////////////////////////////////////
-
- protected void createLayers(LayeredPane layeredPane) {
- layeredPane.add(getScaledLayers(), SCALABLE_LAYERS);
- layeredPane.add(new FreeformLayer(), HANDLE_LAYER);
- // CR377650: Horizontal scrolling needs to be improved
- // moved the feedback layer into printable layers so it shows up in
- // content outline
- // layeredPane.add(new MyFeedbackLayer(), FEEDBACK_LAYER);
- layeredPane.add(new GuideLayer(), GUIDE_LAYER);
- }
-
- protected ScalableFreeformLayeredPane createScaledLayers() {
- ScalableFreeformLayeredPane layers = new ScalableFreeformLayeredPane();
- layers.add(createGridLayer(), GRID_LAYER);
- layers.add(getPrintableLayers(), PRINTABLE_LAYERS);
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- // not needed (?)
- // layers.add(new MyFeedbackLayer(), SCALED_FEEDBACK_LAYER);
- return layers;
- }
-
- protected LayeredPane getScaledLayers() {
- if (scaledLayers == null)
- scaledLayers = createScaledLayers();
- return scaledLayers;
- }
-
- protected LayeredPane createPrintableLayers() {
- FreeformLayeredPane layeredPane = new FreeformLayeredPane();
-
- PrintedPageLayer pageTileLayer = new PrintedPageLayer(this);
- // TODO: get the printer page size from printer preferences
- // and set into the PageTileLayer.
- pageTileLayer.setPageSize(new Dimension(0, 0));
- layeredPane.add(pageTileLayer, PrintedPageLayer.PRINTED_PAGE_LAYER, -1);
-
- // CR400208: Lines bleed from the bp canvas through the Fault handler
- // window
- // changed z-order of connection layer so that it is below figures
- layeredPane.add(new ConnectionLayer(), CONNECTION_LAYER, -1);
- primaryLayer = new FreeformLayer();
- layeredPane.add(primaryLayer, PRIMARY_LAYER, -1);
- primaryLayer.setLayoutManager(new FreeformLayout());
-
- // CR377650: Horizontal scrolling needs to be improved
- // let's put the feedback layer in with the printable layers so
- // we can see the feedback figures in the content outline viewer
- layeredPane.add(new MyFeedbackLayer(), FEEDBACK_LAYER);
- return layeredPane;
- }
-
- protected LayeredPane getPrintableLayers() {
- if (printableLayers == null)
- printableLayers = createPrintableLayers();
- return printableLayers;
- }
-
- protected GridLayer createGridLayer() {
- return new MyGridLayer();
- }
-
- public GridLayer getGridLayer() {
- return (GridLayer) getLayer(GRID_LAYER);
- }
-
- public Layer getLayer(Object key) {
- // ScalableFreeformRootEditPart:
- Layer layer = null;
- if (scaledLayers != null)
- layer = scaledLayers.getLayer(key);
- if (layer != null)
- return layer;
- // FreeformGraphicalRootEditPart:
- if (innerLayers == null)
- return null;
- layer = innerLayers.getLayer(key);
- if (layer != null)
- return layer;
- if (printableLayers == null)
- return null;
- return printableLayers.getLayer(key);
- }
-
- // //////////////////////////////////////////////////////////////////////////
- // Properties
- // //////////////////////////////////////////////////////////////////////////
-
- public Point getScrollPosition() {
- int x = getHorizontalScrollBar().getRangeModel().getValue();
- int y = getVerticalScrollBar().getRangeModel().getValue();
- return new Point(x, y);
- }
-
- public TabbedTitleBarBorder getTabbedTitleBarBorder() {
- return titleBarBorder;
- }
-
- public TabbedWindowBorder getTabbedWindowBorder() {
- return windowBorder;
- }
-
- public void addTabbedWindowListener(WindowFigureListener listener) {
- titleBarBorder.addTabbedWindowListener(listener);
- }
-
- public void removeTabbedWindowListener(WindowFigureListener listener) {
- titleBarBorder.removeTabbedWindowListener(listener);
- }
-
- public Dimension getMinimumSize(int wHint, int hHint) {
- Dimension d = titleBarBorder.getMinimumSize(wHint, hHint);
- d.expand(getInsets().getWidth(), getInsets().getHeight());
- return d;
- }
-
- public int addTab(String s) {
- return titleBarBorder.addTab(s);
- }
-
- public void removeTab(int index) {
- titleBarBorder.removeTab(index);
- internalSetCurrentTab(titleBarBorder.getCurrentTab());
- }
-
- private void internalSetCurrentTab(int index) {
- // Object contents = titleBarBorder.getContents(index);
- // if (contents instanceof IFigure)
- // setContents((IFigure) contents);
- }
-
- public void setCurrentTab(int index) {
- internalSetCurrentTab(index);
- titleBarBorder.setCurrentTab(index);
- }
-
- public int getCurrentTab() {
- return titleBarBorder.getCurrentTab();
- }
-
- public void setContents(IFigure figure) {
- titleBarBorder.setContents(0, figure);
- super.setContents(figure);
- }
-
- public void setContents(int index, Object contents) {
- if (contents instanceof IFigure)
- setContents((IFigure) contents);
- titleBarBorder.setContents(index, contents);
- }
-
- public Object getContents(int index) {
- return titleBarBorder.getContents(index);
- }
-
- public void setVisible(boolean flag) {
- super.setVisible(flag);
- windowBorder.setVisible(flag);
- // hide/show the window contents if it's a SWT composite
- Object contents = getContents();
- if (contents instanceof Composite)
- ((Composite) contents).setVisible(flag);
- }
-
- public void setHighlight(boolean flag) {
- windowBorder.setHighlight(flag);
- }
-
- public void setFont(Font f) {
- titleBarBorder.setFont(f);
- }
-
- public void setForegroundColor(Color c) {
- titleBarBorder.setTextColor(c);
- }
-
- public void setLineRoutingStyle(int style) {
- defaultLineRoutingStyle = style;
- revalidate();
- }
-
- public int getLineRoutingStyle() {
- return defaultLineRoutingStyle;
- }
-
- public Dimension getPreferredSize(int wHint, int hHint) {
- if (prefSize == null) {
- IFigure parent = getParent();
- prefSize = parent.getSize();
- this.getLayoutManager().invalidate();
- Dimension m = super.getPreferredSize(wHint, hHint);
- if (getParent() instanceof CompoundNodeFigure) {
- if (((CompoundNodeFigure) parent).getState() == CompoundNodeFigure.RESTORED) {
- Insets in = ((CompoundNodeFigure) getParent())
- .getAnchorInsets();
- prefSize.width -= in.getWidth();
- prefSize.height -= in.getHeight();
- }
- } else {
- if (m.width > prefSize.width)
- prefSize.width = m.width;
- if (m.height > prefSize.height)
- prefSize.height = m.height;
- }
- }
- return prefSize;
- }
-
- protected boolean isValidationRoot() {
- return true;
- }
-
- // private void validateComposite() {
- // Object contents = getContents();
- // // System.out.println("validate: "+titleBarBorder.getLabel(0)+"
- // // "+contents);
- // if (contents instanceof Composite) {
- // if (getParent() == null) {
- // System.err.println("TabbedWindowFigure.validate() - ERROR");
- // return;
- // }
- // Rectangle r = getBounds().getCopy();
- // r.crop(getInsets());
- // Dimension ps = getParent().getParent().getPreferredSize();
- // Rectangle pr = getParent().getParent().getBounds();
- // titleBarBorder.invalidate();
- // titleBarBorder.getInsets(this);
- // Insets in = getParent().getParent().getInsets();
- // Composite comp = (Composite) getContents();
- // comp.setBounds(pr.x + r.x + in.left, pr.y + r.y, r.width, r.height);
- // comp.moveAbove(null);
- // }
- // }
-
- public void invalidate() {
- prefSize = null;
- super.invalidate();
- }
-
- // //////////////////////////////////////////////////////////////////////
- // IBaseFigure methods
- // //////////////////////////////////////////////////////////////////////
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setText(String
- * text)
- */
- public void setText(String name) {
- titleBarBorder.setLabel(name);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.basic.ITabbedWindow#setName(int,
- * java.lang.String)
- */
- public void setText(int index, String name) {
- titleBarBorder.setLabel(index, name);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getText()
- */
- public String getText() {
- if (titleBarBorder == null)
- return "??";
- return titleBarBorder.getLabel();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public Rectangle getTextBounds() {
- Rectangle r = getClientArea().getCopy();
- r.height = titleBarBorder.getTextExtents(this).height;
- r.x += getInsets().left;
- r.y -= getInsets().top;
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getIcon()
- */
- public Image getIcon() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setIcon(org.eclipse.swt.graphics.Image)
- */
- public void setIcon(Image image) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText(java.lang.String)
- */
- public void setToolTipText(String text) {
- }
-
- public String getToolTipText() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator)
- */
- public void addDecorator(BaseFigureDecorator decorator) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator,
- * int)
- */
- public void addDecorator(BaseFigureDecorator decorator, int position) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(int position) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getDecorators()
- */
- public List getDecorators() {
- return null;
- }
-
- // //////////////////////////////////////////////////////////////////////
- // FreeformFigure methods
- // //////////////////////////////////////////////////////////////////////
-
- private WindowFreeformHelper helper = new WindowFreeformHelper(this);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#addFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void addFreeformListener(FreeformListener listener) {
- addListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#fireExtentChanged()
- */
- public void fireExtentChanged() {
- Iterator iter = getListeners(FreeformListener.class);
- while (iter.hasNext())
- ((FreeformListener) iter.next()).notifyFreeformExtentChanged();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#getFreeformExtent()
- */
- public Rectangle getFreeformExtent() {
- Rectangle r = helper.getFreeformExtent();
- r.x = 0;
- r.y = 0;
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#removeFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void removeFreeformListener(FreeformListener listener) {
- removeListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#setFreeformBounds(org.eclipse.draw2d.geometry.Rectangle)
- */
- public void setFreeformBounds(Rectangle bounds) {
- helper.setFreeformBounds(bounds);
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java
deleted file mode 100644
index 0a6d4b12d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-/**
- * @author Bob Brodt
- *
- * Defines an interface for notifying listeners of page switches on a tabbed
- * window figure.
- */
-public interface WindowFigureListener {
- void tabChanged(int oldIndex, int newIndex);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java
deleted file mode 100644
index 834d51658..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.List;
-
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Stolen from org.eclipse.draw2d.FreeformHelper. See also FreeformLayeredPane.
- *
- * @author bbrodt
- */
-public class WindowFreeformHelper implements FreeformListener {
- FreeformLayeredPane x;
-
- class ChildTracker implements FigureListener {
- public void figureMoved(IFigure source) {
- invalidate();
- }
- }
-
- private FreeformFigure host;
-
- private Rectangle freeformExtent;
-
- private FigureListener figureListener = new ChildTracker();
-
- public WindowFreeformHelper(FreeformFigure host) {
- this.host = host;
- }
-
- public Rectangle getFreeformExtent() {
- if (freeformExtent != null)
- return freeformExtent;
- Rectangle r;
- List children = host.getChildren();
- for (int i = 0; i < children.size(); i++) {
- IFigure child = (IFigure) children.get(i);
- if (child instanceof FreeformFigure)
- r = ((FreeformFigure) child).getFreeformExtent();
- else
- r = child.getBounds();
- if (freeformExtent == null)
- freeformExtent = r.getCopy();
- else
- freeformExtent.union(r);
- }
- Insets insets = host.getInsets();
- if (freeformExtent == null)
- freeformExtent = new Rectangle(0, 0, insets.getWidth(), insets
- .getHeight());
- else {
- host.translateToParent(freeformExtent);
- freeformExtent.expand(insets);
- }
- // System.out.println("New extent calculated for " + host + " = " +
- // freeformExtent);
- return freeformExtent;
- }
-
- public void hookChild(IFigure child) {
- invalidate();
- if (child instanceof FreeformFigure)
- ((FreeformFigure) child).addFreeformListener(this);
- else
- child.addFigureListener(figureListener);
- }
-
- void invalidate() {
- freeformExtent = null;
- host.fireExtentChanged();
- if (host.getParent() != null)
- host.getParent().revalidate();
- else
- host.revalidate();
- }
-
- public void notifyFreeformExtentChanged() {
- // A childs freeform extent has changed, therefore this extent must be
- // recalculated
- invalidate();
- }
-
- public void setFreeformBounds(Rectangle bounds) {
- host.setBounds(bounds);
- bounds = bounds.getCopy();
- host.translateFromParent(bounds);
- List children = host.getChildren();
- for (int i = 0; i < children.size(); i++) {
- IFigure child = (IFigure) children.get(i);
- if (child instanceof FreeformFigure)
- ((FreeformFigure) child).setFreeformBounds(bounds);
- }
- // CR420954: Compensation Handler canvas goes blank after Variables
- // Sections is expanded
- host.getLayoutManager().layout(host);
- }
-
- public void unhookChild(IFigure child) {
- invalidate();
- if (child instanceof FreeformFigure)
- ((FreeformFigure) child).removeFreeformListener(this);
- else
- child.removeFigureListener(figureListener);
- }
-
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java
deleted file mode 100644
index 3dd563218..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanScopeTreeItem;
-
-/**
- * Managed bean Content Provider.
- * <p>
- * <b>Provides grouping by Scope.</b>
- * </p>
- *
- * @author Xiao-guang Zhang, sfshi
- * @version 1.5
- */
-public class ManagedBeanContentProvider implements ITreeContentProvider {
-
- private List scopeItemList = null;
-
-
- /**
- * The constructor
- */
- public ManagedBeanContentProvider() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object
- * parent)
- */
- public Object[] getChildren(Object parent) {
-
- if (parent instanceof FacesConfigType) {
- if (scopeItemList == null) {
- scopeItemList = new ArrayList();
- for (int i = 0; i < ManagedBeanScopeTreeItem.scopeItems.length; i++) {
- ManagedBeanScopeTreeItem scopeTreeItem = new ManagedBeanScopeTreeItem(
- ManagedBeanScopeTreeItem.scopeItems[i],
- (FacesConfigType) parent);
- scopeItemList.add(scopeTreeItem);
- }
- }
- return scopeItemList.toArray();
- } else if (parent instanceof ManagedBeanScopeTreeItem) {
- return ((ManagedBeanScopeTreeItem) parent).getChildren().toArray();
- }
-
- return new Object[0];
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(Object
- * parent)
- */
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object element) {
- if (element instanceof ManagedBeanScopeTreeItem) {
- return ((ManagedBeanScopeTreeItem) element).getParent();
- } else if (element instanceof ManagedBeanType) {
- String scope = null;
- if (((ManagedBeanType) element).getManagedBeanScope() != null) {
- scope = ((ManagedBeanType) element).getManagedBeanScope()
- .getTextContent();
- }
-
- if (scope != null) {
- for (int i = 0; i < scopeItemList.size(); i++) {
- if (((ManagedBeanScopeTreeItem) scopeItemList.get(i))
- .getScope().equals(scope)) {
- return scopeItemList.get(i);
- }
-
- }
- }
- }
-
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object element) {
- if (element instanceof FacesConfigType) {
- return true;
- } else if (element instanceof ManagedBeanScopeTreeItem) {
- return ((ManagedBeanScopeTreeItem) element).hasChildren();
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput != null) {
-// initialize(newInput);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java
deleted file mode 100644
index 3a729c8e0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.provider;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanScopeTreeItem;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Managed Bean Page's TreeViewer Label Provider
- *
- * @author Xiao-guang Zhang, sfshi
- * @version 1.5
- */
-public class ManagedBeanLabelProvider extends LabelProvider {
- /** Cache of images that have been dispensed by this provider */
- private Map imageTable;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.LabelProvider#getText(Object obj)
- */
- public String getText(Object obj) {
- String text = "";
-
- if (obj instanceof ManagedBeanType) {
- ManagedBeanType bean = (ManagedBeanType) obj;
- if (bean.getManagedBeanName() != null) {
- text = bean.getManagedBeanName().getTextContent();
-
- }
- if (text == null || text.length() < 1) {
- if (bean.getManagedBeanClass() != null)
- text = bean.getManagedBeanClass().getTextContent();
- }
- } else if (obj instanceof ManagedBeanScopeTreeItem) {
- text = ((ManagedBeanScopeTreeItem) obj).getScope();
- }
-
- return text;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.LabelProvider#getImage(Object obj)
- */
- public Image getImage(Object obj) {
- ImageDescriptor imageDesc = null;
- if (obj instanceof ManagedBeanType) {
-
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- "facesconfig/FacesConfig_ManagedBean.gif"); //$NON-NLS-1$
-
- } else if (obj instanceof ManagedBeanScopeTreeItem) {
- ManagedBeanScopeTreeItem scopeTreeItem = (ManagedBeanScopeTreeItem) obj;
- if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- "Scope_Session.gif");
- } else if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_REQUEST
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- "Scope_Request.gif");
- } else if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_APPLICATION
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- "Scope_Application.gif");
- } else if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_NONE
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- "Scope_None.gif");
- } else {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- "Scope.gif");
- }
- }
-
- if (imageDesc != null) {
- // Obtain the cached image corresponding to the descriptor
- if (imageTable == null) {
- imageTable = new Hashtable(40);
- }
- Image image = (Image) imageTable.get(imageDesc);
- if (image == null) {
- image = imageDesc.createImage();
- imageTable.put(imageDesc, image);
- }
- return image;
- }
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- ISharedImages.IMG_OBJ_ELEMENT);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java
deleted file mode 100644
index eaab699ac..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * The abstract implementation of IFacesConfigSection.
- *
- *
- * @author jchoi, xgzhang, sfshi
- *
- * @version 1.0
- */
-public abstract class AbstractFacesConfigSection extends SectionPart implements
- IFacesConfigSection, ISelectionProvider, ISelectionChangedListener {
- /** tool kit */
- private FormToolkit toolkit;
-
- /** help context id */
- private String helpContextId = null;
-
- /** help tool tip string */
- private String helpTooltip = null;
-
- /** model object */
- private Object input = null;
-
- private IFacesConfigPage page;
-
- private List selectionChangedListeners = new ArrayList();
-
- /** help image */
- private final static Image HELP_IMAGE = EditorPlugin.getDefault().getImage(
- "help.gif"); //$NON-NLS-1$
-
- /**
- * Constructor with help option.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public AbstractFacesConfigSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, toolkit, ExpandableComposite.TITLE_BAR
- | ExpandableComposite.TWISTIE | Section.DESCRIPTION
- | ExpandableComposite.EXPANDED);
- super.initialize(managedForm);
- this.page = page;
- this.toolkit = toolkit;
- this.helpContextId = helpContextId;
- this.helpTooltip = helpTooltip;
- }
-
- /**
- *
- */
- public void initialize() {
- if (helpContextId != null) {
- createTextClientWithHelp();
- }
-
- getSection().setLayout(new GridLayout());
-
- Composite clientContainer = toolkit.createComposite(getSection());
- GridData gd = new GridData(GridData.FILL_BOTH);
- clientContainer.setLayoutData(gd);
-
- createContents(clientContainer, toolkit);
- getSection().setClient(clientContainer);
-
- }
-
- /**
- *
- *
- */
- private void createTextClientWithHelp() {
- ImageHyperlink helpImage = new ImageHyperlink(getSection(), SWT.NULL);
-
- toolkit.adapt(helpImage, true, true);
-
- helpImage.setImage(HELP_IMAGE); //$NON-NLS-1$
-
- helpImage.setBackground(getSection().getTitleBarGradientBackground());
- if (helpTooltip != null) {
- helpImage.setToolTipText(helpTooltip);
- }
-
- helpImage.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- IContext context = HelpSystem.getContext(helpContextId);
- if (context != null) {
- IHelpResource[] topics = context.getRelatedTopics();
- if (topics != null && topics.length == 1) {
- EditorPlugin.getDefault().getWorkbench()
- .getHelpSystem().displayHelpResource(
- topics[0].getHref());
- } else {
- EditorPlugin.getDefault().getWorkbench()
- .getHelpSystem().displayHelp(helpContextId);
- }
- }
- }
- });
-
- getSection().setTextClient(helpImage);
- }
-
- /**
- * The sub calss should implement this method to create and fill the
- * contents in the section
- *
- * @param container
- * @param toolkit
- */
- protected abstract void createContents(Composite container,
- FormToolkit toolkit);
-
- /**
- * get the input object of this section.
- */
- public Object getInput() {
- return input;
- }
-
- /**
- * set input object for this section.
- */
- public void setInput(Object newInput) {
- if (input != null)
- removeAdaptersFromInput(input);
-
- input = newInput;
-
- if (newInput != null)
- addAdaptersOntoInput(newInput);
- // if (this.getSection().isExpanded())
- refreshAll();
- }
-
- /**
- * Remove adapters from the input object when the section changes it's
- * input. Sub classes should overwrite this method to remove the adapters
- * that they added on.
- *
- * @param oldInput
- */
- protected void removeAdaptersFromInput(Object oldInput) {
-
- }
-
- /**
- * Add adapters onto the input object when the section has new input. Sub
- * classes should their own adapters.
- *
- * @param newInput
- */
- protected void addAdaptersOntoInput(Object newInput) {
-
- }
-
- /**
- * get the page that this section lies in.
- *
- * @return
- */
- public IFacesConfigPage getPage() {
- return page;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /**
- * transfer the selection changed event to detail part.
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this,
- event != null ? event.getSelection()
- : StructuredSelection.EMPTY));
- }
- }
-
- /**
- * the convenient method to get the AdapterFactory instance of the editor;
- *
- * @return the AdapterFactory instance.
- */
- public AdapterFactory getAdapterFactory() {
- return (AdapterFactory) getPage().getEditor().getAdapter(
- AdapterFactory.class);
- }
-
- /**
- * the convenient method to get the EditingDomain instance of the editor;
- *
- * @return the EditingDomain instance.
- */
- public EditingDomain getEditingDomain() {
- return (EditingDomain) getPage().getEditor().getAdapter(
- EditingDomain.class);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java
deleted file mode 100644
index ef89f4e96..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.common.actions.OpenPageAction;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- *
- */
-public abstract class AbstractOverviewSection extends
- AbstractFacesConfigSection {
-
- protected TableViewer tableViewer;
-
- private String targetPageID;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param targetPageID
- * @param title
- * @param description
- * @param helpContextId
- * @param helpTooltip
- */
- public AbstractOverviewSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit, String targetPageID,
- String title, String description, String helpContextId,
- String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.targetPageID = targetPageID;
- getSection().setText(title); //$NON-NLS-1$
- getSection().setDescription(description); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#createContents(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.forms.widgets.FormToolkit)
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 2;
- layout.marginWidth = 2;
- layout.verticalSpacing = 5;
- layout.horizontalSpacing = 6;
- container.setLayout(layout);
- toolkit.paintBordersFor(container);
- Table table = createTable(container);
- if (targetPageID != null) {
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection())
- .size() == 1) {
- OpenPageAction action = new OpenPageAction();
- action.setPageName(targetPageID);
- action.setSelection(tableViewer.getSelection());
- action.run();
- }
- }
- });
- }
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- ComposedAdapterFactory factory = (ComposedAdapterFactory)getAdapterFactory();
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(factory));
- configTableViewer(tableViewer);
- }
-
- /**
- *
- * @return
- */
- abstract protected Table createTable(Composite container);
-
- /**
- *
- * @param tableViewer
- */
- abstract protected void configTableViewer(TableViewer tableViewer);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#clearAll()
- */
- public void clearAll() {
- tableViewer.setInput(null);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#refreshAll()
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java
deleted file mode 100644
index cb0743dce..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A common <code>IFacesConfigSection</code> implementation for the sections that editing
- * the child elements of <application>, including: <action-listener>,
- * <default-render-kit-id>, <message-bundle>, <navigation-handler>,
- * <view-handler>,<state-manager>, <property-resolver>, <variable-resolver> and
- * <locale-config>. This sections will use the EClass object of these elements
- * as the key.
- *
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-public class ApplicationSection extends OthersPageBaseSection {
-
- /** The Eclass object this Section operated */
- private EClass applicationChildClass;
-
- /**
- *
- * @param applicationChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public ApplicationSection(EClass applicationChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.applicationChildClass = applicationChildClass;
- }
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ApplicationSection(EClass componentClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(componentClass, parent, managedForm, page, toolkit, null, null);
- }
-
- /**
- * Create an object which is instance of <code>applicationChildClass</code>.
- *
- * @return
- */
- public EObject createApplicationChildObject() {
- String textValue = null;
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
- FacesConfigType facesConfig = (FacesConfigType) this.getPage()
- .getInput();
- if (applicationChildClass == FacesConfigPackage.eINSTANCE
- .getDefaultRenderKitIdType()) {
-
- /** Open a dialog to select a render-kit of this faces config. */
- textValue = DialogUtil.openRenderKitDialog(getSection().getShell(),
- facesConfig);
- } else if (applicationChildClass == FacesConfigPackage.eINSTANCE
- .getMessageBundleType()) {
- /**
- * Open a dialog the select the message bundles that in current
- * project. If user select a bundle that already declared in this
- * faces config, then shows a warning message.
- */
- List bundles = new ArrayList();
- if (facesConfig.getApplication().size() > 0) {
- ApplicationType applicationType = (ApplicationType) facesConfig
- .getApplication().get(0);
- bundles = applicationType.getMessageBundle();
- }
-
- textValue = DialogUtil.openMessageBundleDialog(getSection()
- .getShell(), project, bundles);
-
- } else {
- /**
- * For other types children, open a ClassDialog to select a class in
- * current project.
- */
- String superType = ModelUtil.getSuperType(applicationChildClass);
- textValue = DialogUtil.openClassDialog(getSection().getShell(),
- project, superType,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
- }
- if (textValue != null && textValue.length() > 0) {
- EObject component = FacesConfigFactory.eINSTANCE
- .create(applicationChildClass);
- // set text content.
- EStructuralFeature feature = (EAttribute) applicationChildClass
- .getEStructuralFeatures().get(0);
- component.eSet(feature, textValue);
- return component;
- }
- return null;
- }
-
- /**
- * Set the <application> element as the structuredViewer's input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof ApplicationType) {
- tableViewer.setInput(input);
- } else
- tableViewer.setInput(null);
- }
-
- /**
- * Add a filter on the table viewer. Only the elements that is a instance of
- * <code>applicationChildClass</code> could be selected.
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return applicationChildClass.isInstance(element);
- }
- });
- }
-
- /**
- * Perform some actions to create new child object and append it to the
- * <application> element.
- */
- void addButtonSelected(SelectionEvent e) {
- /** Create such a new object. */
- EObject obj = createApplicationChildObject();
- if (obj != null) {
-
- boolean needRefreshAll = false;
- Command command = null;
- if (getInput() instanceof ApplicationType) {
- /**
- * The input is a <application> element and not null, append the
- * new object to it.
- */
- ApplicationType application = (ApplicationType) getInput();
- command = AddCommand.create(getEditingDomain(), application,
- null, obj);
- } else {
- /**
- * The input is null, create a <application> element and append
- * it to <faces-config>.
- */
- needRefreshAll = true;
-
- List list = new ArrayList(2);
- ApplicationType application = FacesConfigFactory.eINSTANCE
- .createApplicationType();
- Command cmd1 = AddCommand.create(getEditingDomain(),
- application, null, obj);
- list.add(cmd1);
- Command cmd2 = AddCommand.create(getEditingDomain(), this
- .getPage().getInput(), null, application);
- list.add(cmd2);
- command = new CompoundCommand(list);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll) {
- /** reset the application input. */
- ((OthersPage) this.getPage()).resetApplicationInput();
- }
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
deleted file mode 100644
index fc93583fc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeType;
-import org.eclipse.jst.jsf.facesconfig.emf.DefaultValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.SuggestedValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditAttributeDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class AttributeSection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public AttributeSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.AttributeSection_Name);
- this.getSection().setDescription(
- EditorMessages.AttributeSection_Description);
-
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite attributeSection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.verticalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.marginHeight = 0;
- gl2.numColumns = 2;
- attributeSection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- attributeSection.setLayoutData(gd);
-
- createTableSection(attributeSection, toolkit);
- createButtonsSection(attributeSection, toolkit);
-
- }
-
- /**
- * create table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn nameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- nameCol
- .setText(EditorMessages.AttributeSection_Table_NameColumn);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol
- .setText(EditorMessages.AttributeSection_Table_ClassColumn);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.AttributeSection_Table_DefaultValueColumn);
-
- TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- suggestedValueCol
- .setText(EditorMessages.AttributeSection_Table_SuggestedValueColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getAttributeType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
-
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- /**
- * add an attribute.
- *
- */
- private void addButtonSelected() {
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditAttributeDialog dialog = new AddEditAttributeDialog(shell, true);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (dialog.open() == Dialog.OK) {
-
- // AttributeType newAttribute = dialog.getResult();
- AttributeType newAttribute = FacesConfigFactory.eINSTANCE
- .createAttributeType();
-
- if (dialog.getAttributeName().length() > 0) {
- AttributeNameType attributeNameType = FacesConfigFactory.eINSTANCE
- .createAttributeNameType();
- attributeNameType.setTextContent(dialog.getAttributeName());
- newAttribute.setAttributeName(attributeNameType);
- }
-
- if (dialog.getAttributeClass().length() > 0) {
- AttributeClassType attributeClassType = FacesConfigFactory.eINSTANCE
- .createAttributeClassType();
- attributeClassType.setTextContent(dialog.getAttributeClass());
- newAttribute.setAttributeClass(attributeClassType);
- }
-
- if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- newAttribute.setDefaultValue(defaultValueType);
- }
-
- if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- newAttribute.setSuggestedValue(suggestedValueType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), null, newAttribute); // getEReference(),
- // newAttribute);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit an attribute.
- *
- */
- private void editButtonSelected() {
-
- AttributeType attribute = (AttributeType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(attribute);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditAttributeDialog dialog = new AddEditAttributeDialog(shell, false);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (attribute.getAttributeName() != null) {
- dialog.setAttributeName(attribute.getAttributeName()
- .getTextContent());
- }
-
- if (attribute.getAttributeClass() != null) {
- dialog.setAttributeClass(attribute.getAttributeClass()
- .getTextContent());
- }
-
- if (attribute.getDefaultValue() != null) {
- dialog
- .setDefaultValue(attribute.getDefaultValue()
- .getTextContent());
- }
-
- if (attribute.getSuggestedValue() != null) {
- dialog.setSuggestedValue(attribute.getSuggestedValue()
- .getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(4);
-
- if (attribute.getAttributeName() != null) {
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- attribute.getAttributeName(),
- FacesConfigPackage.eINSTANCE
- .getAttributeNameType_TextContent(), dialog
- .getAttributeName());
- commands.add(cmd1);
- } else if (dialog.getAttributeName().length() > 0) {
- AttributeNameType attributeNameType = FacesConfigFactory.eINSTANCE
- .createAttributeNameType();
- attributeNameType.setTextContent(dialog.getAttributeName());
-
- Command cmd2 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_AttributeName(),
- attributeNameType);
- commands.add(cmd2);
- }
-
- if (attribute.getAttributeClass() != null) {
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- attribute.getAttributeClass(),
- FacesConfigPackage.eINSTANCE
- .getAttributeClassType_TextContent(), dialog
- .getAttributeClass());
- commands.add(cmd3);
- } else if (dialog.getAttributeClass().length() > 0) {
- AttributeClassType attributeClassType = FacesConfigFactory.eINSTANCE
- .createAttributeClassType();
- attributeClassType.setTextContent(dialog.getAttributeClass());
-
- Command cmd4 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_AttributeClass(),
- attributeClassType);
- commands.add(cmd4);
- }
-
- if (attribute.getDefaultValue() != null) {
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- attribute.getDefaultValue(),
- FacesConfigPackage.eINSTANCE
- .getDefaultValueType_TextContent(), dialog
- .getDefaultValue());
- commands.add(cmd5);
-
- } else if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- Command cmd6 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_DefaultValue(),
- defaultValueType);
- commands.add(cmd6);
- }
-
- if (attribute.getSuggestedValue() != null) {
- Command cmd7 = SetCommand.create(this.getEditingDomain(),
- attribute.getSuggestedValue(),
- FacesConfigPackage.eINSTANCE
- .getSuggestedValueType_TextContent(), dialog
- .getSuggestedValue());
- commands.add(cmd7);
- } else if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- Command cmd8 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_SuggestedValue(),
- suggestedValueType);
- commands.add(cmd8);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(attribute);
-
- }
- }
-
- }
-
- /**
- * remove an attribute.
- *
- */
- private void removeButtonSelected() {
- AttributeType attribute = (AttributeType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(attribute);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), null, attribute);// getEReference(), attribute);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
deleted file mode 100644
index e617aada3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentTypeType;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * The sections that used for displaying and editing the general information of
- * a component, the information includs display name, description, component
- * type and component class.
- *
- * @author sfshi
- *
- */
-public class ComponentGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField componentTypeField;
-
- private ClassButtonDialogField componentClassField;
-
- private ComponentGeneralAdapter componentGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ComponentGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.ComponentGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ComponentGeneralSection_Description);
- }
-
- /**
- * Create the UI fields.
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- ComponentType component = (ComponentType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
-
- /** For the new displayname object, add the adapter. */
- displayNameType.eAdapters().add(
- getComponentGeneralAdapter());
- cmd = AddCommand.create(editingDomain, component,
- FacesConfigPackage.eINSTANCE
- .getComponentType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
-
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- ComponentType component = (ComponentType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
- /** For the new description object, add the adapter. */
- description.eAdapters().add(
- getComponentGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, component,
- FacesConfigPackage.eINSTANCE
- .getComponentType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- componentTypeField = new StringDialogField();
- componentTypeField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_ComponentType);
- componentTypeField.doFillIntoGrid(toolkit, container, numberOfColumns);
- componentTypeField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- ComponentTypeType componentType = FacesConfigFactory.eINSTANCE
- .createComponentTypeType();
- componentType
- .setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentType(),
- componentType);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
- }
- });
-
- componentClassField = new ClassButtonDialogField(null);
- componentClassField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_ComponentClass);
- componentClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(componentClassField.getTextControl(
- toolkit, container));
- componentClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- componentClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ComponentClassType componentClass = FacesConfigFactory.eINSTANCE
- .createComponentClassType();
- componentClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentClass(),
- componentClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- componentClassField
- .setSuperClassName(IFacesConfigConstants.COMPONENT_SUPER_CLASS);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- * Refresh the content on this section.
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ComponentType) {
- ComponentType component = (ComponentType) input;
-
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate("");
- }
-
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil.unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate("");
- }
-
- if (component.getComponentType() != null) {
- componentTypeField.setTextWithoutUpdate(component
- .getComponentType().getTextContent());
- } else {
- componentTypeField.setTextWithoutUpdate("");
- }
-
- if (component.getComponentClass() != null) {
- componentClassField.setTextWithoutUpdate(component
- .getComponentClass().getTextContent());
- } else {
- componentClassField.setTextWithoutUpdate("");
- }
- }
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * Add ComponentGeneralAdapter onto <component> and the first <display-name>
- * and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- ComponentType component = (ComponentType) newInput;
- if (EcoreUtil.getExistingAdapter(component,
- ComponentGeneralSection.class) == null) {
-
- component.eAdapters().add(getComponentGeneralAdapter());
- }
-
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ComponentGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getComponentGeneralAdapter());
- }
- }
-
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ComponentGeneralSection.class) == null) {
-
- description.eAdapters().add(getComponentGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove ComponentGeneralAdapter from <component> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- ComponentType component = (ComponentType) oldInput;
- if (EcoreUtil.getExistingAdapter(component,
- ComponentGeneralSection.class) != null) {
- component.eAdapters().remove(getComponentGeneralAdapter());
- }
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ComponentGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getComponentGeneralAdapter());
- }
- }
-
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ComponentGeneralSection.class) != null) {
-
- description.eAdapters().remove(getComponentGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getComponentGeneralAdapter() {
-
- if (componentGeneralAdapter == null) {
- componentGeneralAdapter = new ComponentGeneralAdapter();
- }
- return componentGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <component> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class ComponentGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ComponentGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentType()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_DisplayName()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_Description()) {
- refresh();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refresh();
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
deleted file mode 100644
index a150a60e8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ComponentMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- * @param helpContextId
- * @param helpTooltip
- */
- public ComponentMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ComponentMasterSection_Name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.ComponentMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * ComponentType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getComponentType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new component.
- */
- protected void addButtonSelected(SelectionEvent e) {
- ComponentType component = FacesConfigFactory.eINSTANCE
- .createComponentType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Component(), component);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(component);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
deleted file mode 100644
index 8facc8a4b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterForClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ConverterGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField converterIdField;
-
- private ClassButtonDialogField converterForClassField;
-
- private ClassButtonDialogField converterClassField;
-
- private ConverterGeneralAdapter converterGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ConverterGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.ConverterGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ConverterGeneralSection_Description);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- ConverterType Converter = (ConverterType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) Converter
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
-
- displayNameType.eAdapters().add(
- getConverterGeneralAdapter());
- cmd = AddCommand.create(editingDomain, Converter,
- FacesConfigPackage.eINSTANCE
- .getConverterType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
-
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- ConverterType Converter = (ConverterType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) Converter
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
-
- description.eAdapters().add(
- getConverterGeneralAdapter());
- cmd = AddCommand.create(editingDomain, Converter,
- FacesConfigPackage.eINSTANCE
- .getConverterType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- converterIdField = new StringDialogField();
- // converterIdField.setRequired(true);
- converterIdField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterID);
- converterIdField.doFillIntoGrid(toolkit, container, numberOfColumns);
- converterIdField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- ConverterIdType converterIdType = FacesConfigFactory.eINSTANCE
- .createConverterIdType();
-
- converterIdType
- .setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- List commands = new ArrayList(2);
- Command cmd1 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterForClass(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd1);
- Command cmd2 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterId(),
- converterIdType);
- commands.add(cmd2);
- Command command = new CompoundCommand(commands);
- if (editingDomain != null) {
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- refresh();
- }
- }
- }
- });
-
- converterForClassField = new ClassButtonDialogField(null);
- // converterForClassField.setRequired(true);
- converterForClassField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterForClass);
- converterForClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- converterForClassField.doFillIntoGrid(toolkit, container,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(converterForClassField.getTextControl(
- toolkit, container));
-
- converterForClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ConverterForClassType converterForClass = FacesConfigFactory.eINSTANCE
- .createConverterForClassType();
- converterForClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- List commands = new ArrayList(2);
- Command cmd1 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterId(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd1);
- Command cmd2 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterForClass(),
- converterForClass);
- commands.add(cmd2);
- Command command = new CompoundCommand(commands);
- if (editingDomain != null) {
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- refresh();
- }
- }
-
- }
- });
-
- converterClassField = new ClassButtonDialogField(null);
- // converterClassField.setRequired(true);
- converterClassField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterClass);
- converterClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- converterClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(converterClassField.getTextControl(
- toolkit, container));
-
- converterClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ConverterClassType ConverterClass = FacesConfigFactory.eINSTANCE
- .createConverterClassType();
- ConverterClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterClass(),
- ConverterClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- converterClassField
- .setInterface(IFacesConfigConstants.CONVERTER_INTERFACE);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ConverterType) {
- ConverterType Converter = (ConverterType) input;
-
- if (Converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) Converter
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate("");
- }
-
- if (Converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) Converter
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil
- .unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate("");
- }
-
- if (Converter.getConverterId() != null) {
- converterIdField.setTextWithoutUpdate(Converter
- .getConverterId().getTextContent());
- } else {
- converterIdField.setTextWithoutUpdate("");
- }
-
- if (Converter.getConverterForClass() != null) {
- converterForClassField.setTextWithoutUpdate(Converter
- .getConverterForClass().getTextContent());
- } else {
- converterForClassField.setTextWithoutUpdate("");
- }
-
- if (Converter.getConverterClass() != null) {
- converterClassField.setTextWithoutUpdate(Converter
- .getConverterClass().getTextContent());
- } else {
- converterClassField.setTextWithoutUpdate("");
- }
-
- }
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * Add ConverterGeneralAdapter onto <converter> and the first <display-name>
- * and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- ConverterType converter = (ConverterType) newInput;
- if (EcoreUtil.getExistingAdapter(converter,
- ConverterGeneralSection.class) == null) {
-
- converter.eAdapters().add(getConverterGeneralAdapter());
- }
-
- if (converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) converter
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ConverterGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getConverterGeneralAdapter());
- }
- }
-
- if (converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) converter
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ConverterGeneralSection.class) == null) {
-
- description.eAdapters().add(getConverterGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove ConverterGeneralAdapter from <converter> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- ConverterType converter = (ConverterType) oldInput;
- if (EcoreUtil.getExistingAdapter(converter,
- ConverterGeneralSection.class) != null) {
- converter.eAdapters().remove(getConverterGeneralAdapter());
- }
- if (converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) converter
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ConverterGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getConverterGeneralAdapter());
- }
- }
-
- if (converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) converter
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ConverterGeneralSection.class) != null) {
-
- description.eAdapters().remove(getConverterGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getConverterGeneralAdapter() {
-
- if (converterGeneralAdapter == null) {
- converterGeneralAdapter = new ConverterGeneralAdapter();
- }
- return converterGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <converter> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class ConverterGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ConverterGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterId()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterForClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_Description()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_DisplayName()) {
- refresh();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refresh();
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
deleted file mode 100644
index 887124630..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ConverterMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- * @param helpContextId
- * @param helpTooltip
- */
- public ConverterMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ConverterMasterSection_Name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.ConverterMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * ConverterType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new Converter.
- */
- protected void addButtonSelected(SelectionEvent e) {
- ConverterType Converter = FacesConfigFactory.eINSTANCE
- .createConverterType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Converter(), Converter);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(Converter);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
deleted file mode 100644
index d53073c2f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * An default implementation of AbstractFacesConfigSection for Master Section.
- *
- * @author sfshi
- *
- */
-public class FacesConfigMasterSection extends AbstractFacesConfigSection {
-
- private StructuredViewer structuredViewer;
-
- protected Button removeButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- * @param helpContextId
- * @param helpTooltip
- */
- public FacesConfigMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page,
- String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- structuredViewer = createViewer(container, toolkit);
- structuredViewer.addSelectionChangedListener(this);
- createOperationSection(container, toolkit);
- }
-
- /**
- * Create the structured viewer, set up content & label provider for it.
- * Defaultly create a tableviewer.
- *
- * @param parent
- * @param toolkit
- * @return
- */
- protected StructuredViewer createViewer(Composite parent,
- FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(tableContainer);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tableContainer.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- tableContainer.setLayout(layout);
-
- TableViewer tableViewer = new TableViewer(tableContainer, SWT.SINGLE
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- tableViewer.getControl().setLayoutData(gd);
-
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- configViewer(tableViewer);
-
- return tableViewer;
- }
-
- /**
- * Config the viewer, such as set a filter and so on. Sub classes should
- * override this method to add filter.
- *
- * @param structuredViewer
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- }
-
- /**
- * Defaultly we create a "New" button and a "Remove" button. Sub classes can
- * overwrite this method if need other functions.
- *
- * @param parent
- * @param toolkit
- */
- protected void createOperationSection(Composite parent, FormToolkit toolkit) {
- Composite operationContainer = toolkit.createComposite(parent);
- GridData gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- GridLayout layout = new GridLayout();
-
- operationContainer.setLayout(layout);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add, SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, SWT.PUSH);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- removeButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
- });
- }
-
- /**
- *
- * @param e
- */
- protected void addButtonSelected(SelectionEvent e) {
-
- }
-
- /**
- *
- * @param e
- */
- protected void removeButtonSelected(SelectionEvent e) {
-
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- List commands = new ArrayList(ssel.size());
- for (Iterator iter = ssel.iterator(); iter.hasNext();) {
- EObject element = (EObject) iter.next();
- Command command = RemoveCommand.create(getEditingDomain(),
- element);
- commands.add(command);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
-
- }
-
- /**
- *
- * update the buttons' enable state.
- */
- protected void updateButtons() {
- IStructuredSelection ssel = (IStructuredSelection) structuredViewer
- .getSelection();
-
- removeButton.setEnabled(!ssel.isEmpty());
- }
-
- /**
- *
- */
- public ISelection getSelection() {
- return structuredViewer.getSelection();
- }
-
- /**
- *
- */
- public void setSelection(ISelection selection) {
- structuredViewer.setSelection(selection);
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
- }
-
- /**
- * refresh the display of this section.
- */
- public void refresh() {
- super.refresh();
- structuredViewer.refresh();
- updateButtons();
- }
-
- /**
- *
- */
- public void refreshAll() {
- // master section refresh all:
- setViewerInput(getInput());
- updateButtons();
-
- // detial sections refresh:
- // fire an event to the detail sections, let them
- // refresh.
- selectionChanged(null);
- }
-
- /**
- * set the structuredViewer's input
- *
- * @param input
- */
- private void setViewerInput(Object input) {
- structuredViewer.setInput(input);
- }
-
- /**
- *
- */
- protected void expansionStateChanged(boolean expanded) {
- if (expanded) {
- if (structuredViewer.getInput() == null) {
- refreshAll();
- }
- structuredViewer.refresh(true);
- structuredViewer.setSelection(structuredViewer.getSelection());
- } else {
- structuredViewer.setSelection(null);
- }
- super.expansionStateChanged(expanded);
- }
-
- /**
- *
- */
- protected void expansionStateChanging(boolean expanding) {
- if (!expanding) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- this.getSection().setLayoutData(gd);
- } else {
- ((FacesConfigMasterDetailPage) getPage()).closeOtherSections(this);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- this.getSection().setLayoutData(gd);
- }
-
- super.expansionStateChanging(expanding);
- }
-
- /**
- * get the viewer.
- *
- * @return
- */
- public StructuredViewer getStructuredViewer() {
- return structuredViewer;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- // TODO Auto-generated method stub
- super.selectionChanged(event);
- updateButtons();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
deleted file mode 100644
index db5f1b793..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
+++ /dev/null
@@ -1,456 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacetNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacetType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditFacetDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class FacetSection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public FacetSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.FacetSection_Name);
- this.getSection().setDescription(
- EditorMessages.FacetSection_Description);
-
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite facetSection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.numColumns = 2;
- facetSection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- facetSection.setLayoutData(gd);
-
- createTableSection(facetSection, toolkit);
- createButtonsSection(facetSection, toolkit);
-
- }
-
- /**
- * create facet table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn facetNameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- facetNameCol
- .setText(EditorMessages.FacetSection_Table_FacetNameColumn);
- TableColumn displayNameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- displayNameCol
- .setText(EditorMessages.FacetSection_Table_DisplayNameColumn);//$NON-NLS-1$
-
- TableColumn descriptionCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- descriptionCol
- .setText(EditorMessages.FacetSection_Table_DescriptionColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getFacetType().isInstance(
- element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * create buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
- }
-
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * refresh the table viewer and update buttons.
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
- }
-
- /**
- * Update the buttons' enable status.
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * add a facet.
- *
- */
- private void addButtonSelected() {
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditFacetDialog dialog = new AddEditFacetDialog(shell, true);
- if (dialog.open() == Dialog.OK) {
-
- String newFacetName = dialog.getFacetName();
- String newDisplayName = dialog.getDisplayName();
- String newDescription = dialog.getDescription();
-
- FacetType newFacet = FacesConfigFactory.eINSTANCE.createFacetType();
- if (newFacetName.length() > 0) {
- FacetNameType facetNameType = FacesConfigFactory.eINSTANCE
- .createFacetNameType();
- facetNameType.setTextContent(newFacetName);
- newFacet.setFacetName(facetNameType);
- }
-
- if (newDisplayName.length() > 0) {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayName);
- newFacet.getDisplayName().add(displayNameType);
- }
-
- if (newDescription.length() > 0) {
- DescriptionType descriptionType = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- descriptionType.setTextContent(newDescription);
- newFacet.getDescription().add(descriptionType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_Facet(), newFacet);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit a facet.
- *
- */
- private void editButtonSelected() {
- FacetType facet = (FacetType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(facet);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditFacetDialog dialog = new AddEditFacetDialog(shell, false);
- if (facet.getFacetName() != null)
- dialog.setFacetName(facet.getFacetName().getTextContent());
-
- if (facet.getDisplayName().size() > 0) {
- dialog.setDisplayName(((DisplayNameType) facet.getDisplayName()
- .get(0)).getTextContent());
- }
-
- if (facet.getDescription().size() > 0) {
- dialog.setDescription(((DescriptionType) facet.getDescription()
- .get(0)).getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(3);
-
- String newFacetName = dialog.getFacetName();
- String newDisplayName = dialog.getDisplayName();
- String newDescription = dialog.getDescription();
- if (facet.getFacetName() != null) {
- Command cmd1 = SetCommand.create(getEditingDomain(), facet
- .getFacetName(), FacesConfigPackage.eINSTANCE
- .getFacetNameType_TextContent(), newFacetName);
- commands.add(cmd1);
- } else if (newFacetName.length() > 0) {
- FacetNameType newFacetNameType = FacesConfigFactory.eINSTANCE
- .createFacetNameType();
- newFacetNameType.setTextContent(newFacetName);
- Command cmd2 = AddCommand.create(getEditingDomain(), facet,
- FacesConfigPackage.eINSTANCE.getFacetType_FacetName(),
- newFacetNameType);
- commands.add(cmd2);
- }
-
- if (facet.getDisplayName().size() > 0) {
- DisplayNameType displayNameType = (DisplayNameType) facet
- .getDisplayName().get(0);
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- displayNameType, FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayName);
- commands.add(cmd3);
- } else if (newDisplayName.length() > 0) {
- DisplayNameType newDisplayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- newDisplayNameType.setTextContent(newDisplayName);
- Command cmd4 = AddCommand
- .create(this.getEditingDomain(), facet,
- FacesConfigPackage.eINSTANCE
- .getFacetType_DisplayName(),
- newDisplayNameType);
- commands.add(cmd4);
- }
-
- if (facet.getDescription().size() > 0) {
- DescriptionType descriptionType = (DescriptionType) facet
- .getDescription().get(0);
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- descriptionType, FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescription);
- commands.add(cmd5);
- } else if (newDescription.length() > 0) {
- DescriptionType newDescriptionType = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- newDescriptionType.setTextContent(newDescription);
- Command cmd6 = AddCommand
- .create(this.getEditingDomain(), facet,
- FacesConfigPackage.eINSTANCE
- .getFacetType_Description(),
- newDescriptionType);
- commands.add(cmd6);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(facet);
- }
- }
-
- }
-
- /**
- * remove a facet.
- *
- */
- private void removeButtonSelected() {
- FacetType facet = (FacetType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(facet);
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_Facet(), facet);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java
deleted file mode 100644
index a1416397f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-public class FactorySection extends OthersPageBaseSection {
- /** The Eclass object this Section operated */
- private EClass factoryChildClass;
-
- /**
- *
- * @param factoryChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public FactorySection(EClass factoryChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.factoryChildClass = factoryChildClass;
- }
-
- /**
- *
- * @param factoryChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public FactorySection(EClass factoryChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(factoryChildClass, parent, managedForm, page, toolkit, null, null);
- }
-
- /**
- * Create an object which is instance of <code>factoryChildClass</code>.
- *
- * @return
- */
- public EObject createFactoryChildObject() {
- String superType = ModelUtil.getSuperType(factoryChildClass);
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
- String result = DialogUtil.openClassDialog(getSection().getShell(),
- project, superType,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
-
- if (result != null) {
- EObject component = FacesConfigFactory.eINSTANCE
- .create(factoryChildClass);
- // set the text content value.
- EStructuralFeature feature = (EAttribute) factoryChildClass
- .getEStructuralFeatures().get(0);
- component.eSet(feature, result);
- return component;
- }
- return null;
- }
-
- /**
- * Set the <factory> element as the structuredViewer's input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof FactoryType) {
- tableViewer.setInput(input);
- } else
- tableViewer.setInput(null);
- }
-
- /**
- * Add a filter on the table viewer. Only the elements that is a instance of
- * <code>factoryChildClass</code> could be selected.
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return factoryChildClass.isInstance(element);
- }
- });
- }
-
- /**
- * Perform some actions to create new child object and append it to the
- * <factory> element.
- */
- void addButtonSelected(SelectionEvent e) {
- /** Create a new object which is instance of factoryChildClass. */
- EObject obj = createFactoryChildObject();
- if (obj != null) {
- boolean needRefreshAll = false;
- Command command = null;
- if (getInput() instanceof FactoryType) {
- /**
- * The input is a <factory> element and not null, append the new
- * object to it.
- */
- FactoryType factory = (FactoryType) getInput();
- command = AddCommand.create(getEditingDomain(), factory, null,
- obj);
- } else {
- /**
- * The input is null, create a <factory> element and append it
- * to <faces-config>.
- */
- needRefreshAll = true;
- List list = new ArrayList(2);
- FactoryType factory = FacesConfigFactory.eINSTANCE
- .createFactoryType();
- Command cmd1 = AddCommand.create(getEditingDomain(), factory,
- null, obj);
- list.add(cmd1);
- Command cmd2 = AddCommand.create(getEditingDomain(), this
- .getPage().getInput(), null, factory);
- list.add(cmd2);
- command = new CompoundCommand(list);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll)
- ((OthersPage) this.getPage()).resetFactoryInput();
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java
deleted file mode 100644
index f3f928667..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-/**
- * This interface is used to build relation between model SSEModel and
- * controller DialogFieldGroup
- *
- * @author Xiao-guang Zhang
- * @version
- */
-public interface IDialogFieldGroup {
- /**
- * set the input of this section
- *
- * @param newInput
- */
- void setInput(Object newInput);
-
- /**
- * get the input of this section
- *
- * @return
- */
- Object getInput();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java
deleted file mode 100644
index f43197c27..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-
-/**
- * Section interface to build relation between model and adapter
- *
- * @author sfshi
- *
- */
-public interface IFacesConfigSection {
- /**
- * set the input of this section
- *
- * @param newInput
- */
- void setInput(Object newInput);
-
- /**
- * get the input of this section
- *
- * @return
- */
- Object getInput();
-
- /**
- * initialize current section based on the input
- *
- */
- void initialize();
-
- /**
- * clear all section's contents.
- *
- */
- void clearAll();
-
- /**
- * refresh the needed parts of the section
- *
- */
- void refresh();
-
- /**
- * refresh all parts of the section
- *
- */
- void refreshAll();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
deleted file mode 100644
index 553713c83..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * This section handles managed bean's initialization, including general class
- * type, map and list type managed bean.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class InitializationSection extends AbstractFacesConfigSection {
- private static final String MANAGEDBEAN_GENERAL_CLASS = EditorMessages.InitializationSection_ClassType_General;
-
- private static final String MANAGEDBEAN_MAP = EditorMessages.InitializationSection_ClassType_Map;
-
- private static final String MANAGEDBEAN_LIST = EditorMessages.InitializationSection_ClassType_List;
-
- /** property initiliazation container composite */
- private Composite propertySection;
-
- /** property initiliazation DialogFieldGroup */
- private ManagedPropertyEditGroup managedPropertyGroup;
-
- /** map entries initiliazation container composite */
- private Composite mapSection;
-
- /** map entries initiliazation DialogFieldGroup */
- private MapEntriesEditGroup mapEntryGroup;
-
- /** list entries initiliazation container composite */
- private Composite listSection;
-
- /** list entries initiliazation DialogFieldGroup */
- private ListEntriesEditGroup listEntryGroup;
-
- /** the PageBook control for three kinds of managed bean */
- private PageBook pageBook;
-
- /** RadiosDialogField for three kinds of managed bean */
- private RadiosDialogField beanTypeField;
-
- /** current pages selection */
- private int currentPageIndex = 0;
-
- /**
- * @param managedForm
- * @param toolkit
- * @param editor
- */
- public InitializationSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null); //$NON-NLS-1$
- getSection().setText(EditorMessages.InitializationSection_Name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.InitializationSection_Description); //$NON-NLS-1$
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.BaseSectionPart#createClient(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.forms.widgets.FormToolkit)
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- container.setLayout(gl);
- toolkit.paintBordersFor(container);
-
- createBeanTypeEntry(container, toolkit, numberOfColumns);
- createInitializationEntry(container, toolkit, numberOfColumns);
- }
-
- /**
- * create the bean type selection section
- *
- * @param container
- * @param toolkit
- */
- private void createBeanTypeEntry(Composite container, FormToolkit toolkit,
- int numberOfColumns) {
- beanTypeField = new RadiosDialogField();
- String[] items = { MANAGEDBEAN_GENERAL_CLASS, MANAGEDBEAN_MAP,
- MANAGEDBEAN_LIST };
- beanTypeField
- .setLabelText(EditorMessages.InitializationSection_ClassType);
- beanTypeField.setItems(items);
- beanTypeField.doFillIntoGrid(toolkit, container, numberOfColumns);
- beanTypeField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- RadiosDialogField beanTypeField = (RadiosDialogField) field;
-
- boolean bChangedSuccess = false;
- if (beanTypeField.getSelectedIndex() == 0) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.MANAGED_PROPERTY,
- false);
- } else if (beanTypeField.getSelectedIndex() == 1) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.MAP_ENTRIES, false);
- } else if (beanTypeField.getSelectedIndex() == 2) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.LIST_ENTRIES, false);
- }
-
- if (bChangedSuccess) {
- currentPageIndex = beanTypeField.getSelectedIndex();
- } else {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField
- .setSelectedIndexWithoutUpdate(currentPageIndex);
- }
- }
- });
- }
-
- /**
- * switch to general property, map-entries, or list-entries group If
- * bForceClear equals to true, the others page will be cleared without user
- * confirmation. if bForceClear equals to false, the confirmation dialog
- * will pop up and let user determine whether this page is cleared or not.
- *
- * @param pageID -
- * IFacesConfigConstants.MANAGED_PROPERTY,
- * MAP_ENTRIES,LIST_ENTRIES
- * @param bForceClearOthers -
- * Force to clear other pages.
- */
- private boolean switchPage(String pageID, boolean bForceClearOthers) {
- if (pageID == IFacesConfigConstants.MANAGED_PROPERTY) {
- if (clearPage(IFacesConfigConstants.MAP_ENTRIES, bForceClearOthers)
- && clearPage(IFacesConfigConstants.LIST_ENTRIES,
- bForceClearOthers)) {
- managedPropertyGroup.refreshAll();
- pageBook.showPage(propertySection);
- // FIXME: there should be some other methods to resize the whole
- // section.
- InitializationSection.this.getSection().setExpanded(false);
- InitializationSection.this.getSection().setExpanded(true);
- return true;
- }
- } else if (pageID == IFacesConfigConstants.MAP_ENTRIES) {
- if (clearPage(IFacesConfigConstants.MANAGED_PROPERTY,
- bForceClearOthers)
- && clearPage(IFacesConfigConstants.LIST_ENTRIES,
- bForceClearOthers)) {
- mapEntryGroup.refreshAll();
- pageBook.showPage(mapSection);
- // FIXME: there should be some other methods to resize the whole
- // section.
- InitializationSection.this.getSection().setExpanded(false);
- InitializationSection.this.getSection().setExpanded(true);
- return true;
- }
- } else if (pageID == IFacesConfigConstants.LIST_ENTRIES) {
- if (clearPage(IFacesConfigConstants.MANAGED_PROPERTY,
- bForceClearOthers)
- && clearPage(IFacesConfigConstants.MAP_ENTRIES,
- bForceClearOthers)) {
- listEntryGroup.refreshAll();
- pageBook.showPage(listSection);
- // FIXME: there should be some other methods to resize the whole
- // section.
- InitializationSection.this.getSection().setExpanded(false);
- InitializationSection.this.getSection().setExpanded(true);
- return true;
- }
- }
- return false;
- }
-
- /**
- * clear one specified page according to pageID if bForceClear equals to
- * false, the confirmation dialog will pop up and let user determine whether
- * this page is cleared or not.
- *
- * @param pageID -
- * IFacesConfigConstants.MANAGED_PROPERTY,
- * MAP_ENTRIES,LIST_ENTRIES
- * @param bForceClear -
- * force to clear current page.
- * @return
- */
- private boolean clearPage(String pageID, boolean bForceClear) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
-
- if (pageID == IFacesConfigConstants.MANAGED_PROPERTY) {
- if (managedBean.getManagedProperty().size() == 0) {
- return true;
- }
-
- if (bForceClear
- || EditorPlugin
- .getAlerts()
- .confirm(
- "ManagedBeanInitializationSection.Remove.Title",
- "ManagedBeanInitializationSection.RemoveManagedProperty")) {
- Command cmd = SetCommand.create(this.getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedProperty(),
- SetCommand.UNSET_VALUE);
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- return true;
- }
-
- return false;
- }
- } else if (pageID == IFacesConfigConstants.MAP_ENTRIES) {
- if (managedBean.getMapEntries() == null) {
- return true;
- }
-
- if (bForceClear
- || EditorPlugin
- .getAlerts()
- .confirm(
- "ManagedBeanInitializationSection.Remove.Title",
- "ManagedBeanInitializationSection.RemoveMapEntries")) {
- Command cmd = SetCommand.create(this.getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- SetCommand.UNSET_VALUE);
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- return true;
- }
- }
- } else if (pageID == IFacesConfigConstants.LIST_ENTRIES) {
- if (managedBean.getListEntries() == null) {
- return true;
- }
-
- if (bForceClear
- || EditorPlugin
- .getAlerts()
- .confirm(
- "ManagedBeanInitializationSection.Remove.Title",
- "ManagedBeanInitializationSection.RemoveListEntries")) {
- Command cmd = SetCommand.create(this.getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ListEntries(),
- SetCommand.UNSET_VALUE);
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * create property initialization section
- *
- * @param container
- * @param toolkit
- */
- private void createInitializationEntry(Composite container,
- FormToolkit toolkit, int numberOfColumns) {
- pageBook = new PageBook(container, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = numberOfColumns;
- pageBook.setLayoutData(gd);
- toolkit.paintBordersFor(pageBook);
-
- managedPropertyGroup = new ManagedPropertyEditGroup(this);
- managedPropertyGroup.initialize();
- managedPropertyGroup.addSelectionChangedListener(this);
-
- mapEntryGroup = new MapEntriesEditGroup(this);
- mapEntryGroup.initialize();
- mapEntryGroup.addSelectionChangedListener(this);
-
- listEntryGroup = new ListEntriesEditGroup(this);
- listEntryGroup.initialize();
- listEntryGroup.addSelectionChangedListener(this);
-
- propertySection = toolkit.createComposite(pageBook);
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- propertySection.setLayout(gl);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.setLayoutData(gd);
- managedPropertyGroup.layoutDialogFields(toolkit, propertySection);
-
- mapSection = toolkit.createComposite(pageBook);
- mapEntryGroup.layoutDialogFields(toolkit, mapSection);
-
- listSection = toolkit.createComposite(pageBook);
- listEntryGroup.layoutDialogFields(toolkit, listSection);
-
- pageBook.showPage(propertySection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.ISSESection#setInput(java.lang.Object)
- */
- public void setInput(Object newInput) {
- super.setInput(newInput);
- refreshAll();
- }
-
- public void refreshAll() {
- if (getInput() instanceof ManagedBeanType) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- managedPropertyGroup.setInput(managedBean);
- mapEntryGroup.setInput(managedBean);
- listEntryGroup.setInput(managedBean);
- if (managedBean.getManagedProperty().size() > 0) {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(0);
- } else if (managedBean.getMapEntries() != null) {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(1);
- } else if (managedBean.getListEntries() != null) {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(2);
- } else {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(0);
- }
- }
- }
-
- public void clearAll() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#getSelection()
- */
- public ISelection getSelection() {
- // TODO Auto-generated method stub
- return super.getSelection();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
deleted file mode 100644
index 7aa919470..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class LifecycleSection extends OthersPageBaseSection {
-
- /**
- * The Eclass object this Section operated. Since lifecycle only has one
- * type child: phase-listener, so this object should always equals
- * <code>FacesConfigPackage.eINSTANCE
- .getPhaseListenerType()</code>.
- */
- private EClass lifecycleChildClass;
-
- /**
- *
- * @param lifecycleChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public LifecycleSection(EClass lifecycleChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.lifecycleChildClass = lifecycleChildClass;
- }
-
- /**
- *
- * @param lifecycleChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public LifecycleSection(EClass lifecycleChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(lifecycleChildClass, parent, managedForm, page, toolkit, null,
- null);
- }
-
- public EObject createLifecycleChildObject() {
- String superType = ModelUtil.getSuperType(lifecycleChildClass);
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
- String result = DialogUtil.openClassDialog(getSection().getShell(),
- project, superType,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
-
- if (result != null) {
- EObject component = FacesConfigFactory.eINSTANCE
- .create(lifecycleChildClass);
- EStructuralFeature feature = (EAttribute) lifecycleChildClass
- .getEStructuralFeatures().get(0);
- component.eSet(feature, result);
- return component;
- }
- return null;
- }
-
- /**
- * Set the <lifecycle> element as the structuredViewer's input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof LifecycleType) {
- tableViewer.setInput(input);
- } else
- tableViewer.setInput(null);
- }
-
- /**
- * Add a filter on the table viewer. Only the elements that is a instance of
- * <code>lifecycleChildClass</code> could be selected.
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return lifecycleChildClass.isInstance(element);
- }
- });
- }
-
- /**
- * Perform some actions to create new child object and append it to the
- * <lifecycle> element.
- */
- void addButtonSelected(SelectionEvent e) {
- EObject obj = createLifecycleChildObject();
- if (obj != null) {
-
- boolean needRefreshAll = false;
- Command command = null;
- if (getInput() instanceof LifecycleType) {
- LifecycleType lifeCycle = (LifecycleType) getInput();
- command = AddCommand.create(getEditingDomain(), lifeCycle,
- null, obj);
- } else {
- needRefreshAll = true;
- LifecycleType lifeCycle = FacesConfigFactory.eINSTANCE
- .createLifecycleType();
- lifeCycle.getPhaseListener().add(obj);
- command = AddCommand.create(getEditingDomain(), this.getPage()
- .getInput(), null, lifeCycle);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll)
- ((OthersPage) this.getPage()).resetLifecycleInput();
- }
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
deleted file mode 100644
index b1cdea557..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
+++ /dev/null
@@ -1,640 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.EditValueDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * ListEntries editing DialogFieldGroup
- *
- * @author Xiao-guang Zhang, sfshi
- * @version
- */
-public class ListEntriesEditGroup extends DialogFieldGroup implements
- IDialogFieldGroup, ISelectionProvider, ISelectionChangedListener {
-
- private ClassButtonDialogField valueClassField;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private IProject currentProject;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ManagedBeanType managedBean;
-
- private AbstractFacesConfigSection section;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- * @param propertyRecorder
- */
- public ListEntriesEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- GridData data = new GridData(GridData.FILL_BOTH);
- parent.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.marginHeight = 0;
- parent.setLayout(gl);
-
- layoutListTypeSelectionSection(toolkit, parent);
-
- createAndLayoutListValueSection(toolkit, parent);
- }
-
- /**
- *
- */
- private void layoutListTypeSelectionSection(FormToolkit toolkit,
- Composite container) {
- Composite typeSelectionSection = null;
- if (toolkit != null) {
- typeSelectionSection = toolkit.createComposite(container);
- toolkit.paintBordersFor(typeSelectionSection);
- } else {
- typeSelectionSection = SWTUtils
- .createComposite(container, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
- valueClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean.getListEntries() == null) {
- isNew = true;
- ListEntriesType listEntries = FacesConfigFactory.eINSTANCE
- .createListEntriesType();
- listEntries.setValueClass(valueClass);
- cmd = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ListEntries(),
- listEntries);
- } else {
- isNew = false;
- ListEntriesType listEntries = managedBean
- .getListEntries();
- cmd = SetCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_ValueClass(),
- valueClass);
- }
-
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- if (isNew)
- refreshAll();
- }
-
- }
- });
- valueClassField.doFillIntoGrid(toolkit, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(valueClassField.getTextControl(
- toolkit, container));
- }
-
- /**
- * @param toolkit
- * @param parent
- */
- private void createAndLayoutListValueSection(FormToolkit toolkit,
- Composite parent) {
- Composite listValueSection = null;
- if (toolkit != null) {
- listValueSection = toolkit.createComposite(parent);
- toolkit.paintBordersFor(listValueSection);
- } else {
- listValueSection = SWTUtils.createComposite(parent, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- listValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- listValueSection.setLayout(gl);
- DialogFieldBase valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$
- valuesTitle.doFillIntoGrid(toolkit, listValueSection, numberOfColumns);
-
- // list's value table
- Table listTable;
- if (toolkit == null) {
- listTable = new Table(listValueSection, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- } else {
- listTable = new Table(listValueSection, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- }
-
- listTable.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- updateButtons();
- }
-
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- listTable.setLayoutData(gd);
- listTable.setHeaderVisible(true);
- listTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- layout.addColumnData(new ColumnWeightData(1, true));
- listTable.setLayout(layout);
- TableColumn valueCol = new TableColumn(listTable, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
- valueCol.setResizable(true);
-
- listTable.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
- tableViewer = new TableViewer(listTable);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- section.getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(section
- .getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getValueType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE.getNullValueType()
- .isInstance(element);
- }
- });
- tableViewer.addSelectionChangedListener(this);
-
- Composite operationContainer = null;
- if (toolkit != null) {
- operationContainer = toolkit.createComposite(listValueSection);
- } else {
- operationContainer = SWTUtils.createComposite(listValueSection,
- SWT.NONE);
- }
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = null;
- if (toolkit != null) {
- addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
- SWT.PUSH);
- } else {
- addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = null;
- if (toolkit != null) {
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, SWT.PUSH);
- } else {
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
- }
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = null;
- if (toolkit != null) {
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- } else {
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove); //$NON-NLS-1$
- }
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
- }
-
- protected void addButtonSelected() {
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, false, null);
- if (dialog.open() == Dialog.OK) {
-
- EditingDomain editingDomain = section.getEditingDomain();
- if (this.managedBean.getListEntries() == null) {
- ListEntriesType listEntries = FacesConfigFactory.eINSTANCE
- .createListEntriesType();
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- listEntries.getNullValue().add(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- listEntries.getValue().add(value);
- }
-
- Command cmd1 = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ListEntries(), listEntries);
- if (cmd1.canExecute()) {
- editingDomain.getCommandStack().execute(cmd1);
- refreshAll();
- }
- } else {
- ListEntriesType listEntries = managedBean.getListEntries();
- Command cmd;
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- cmd = AddCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- cmd = AddCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_Value(), value);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- }
- }
-
- protected void editButtonSelected() {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- boolean isNullValue;
- String valueText = null;
- if (select instanceof NullValueType)
- isNullValue = true;
- else {
- isNullValue = false;
- valueText = ((ValueType) select).getTextContent();
- }
- ListEntriesType listEntries = managedBean.getListEntries();
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, isNullValue, valueText);
- if (dialog.open() == Dialog.OK) {
- EditingDomain editingDomain = section.getEditingDomain();
- Command cmd = null;
- if (isNullValue && !dialog.isNullValue()) {
- List commands = new ArrayList();
- Command cmd1 = RemoveCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), select);
- commands.add(cmd1);
-
- // listEntries.getNullValue().remove(select);
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- Command cmd2 = AddCommand
- .create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_Value(), value);
- commands.add(cmd2);
- cmd = new CompoundCommand(commands);
- } else if (!isNullValue && dialog.isNullValue()) {
- List commands = new ArrayList();
- Command cmd1 = RemoveCommand
- .create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_Value(), select);
- commands.add(cmd1);
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- Command cmd2 = AddCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), nullValue);
- commands.add(cmd2);
- cmd = new CompoundCommand(commands);
- } else if (!isNullValue && !dialog.isNullValue()) {
- cmd = SetCommand
- .create(editingDomain, select,
- FacesConfigPackage.eINSTANCE
- .getValueType_TextContent(), dialog
- .getResultData());
- }
-
- if (cmd != null && cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- }
-
- protected void removeButtonSelected() {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- ListEntriesType listEntries = managedBean.getListEntries();
- EditingDomain editingDomain = section.getEditingDomain();
- Command cmd;
- if (select instanceof NullValueType) {
- cmd = RemoveCommand
- .create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), select);
- } else {
- cmd = RemoveCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE.getListEntriesType_Value(),
- select);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.wizards.IDialogFieldGroup#setInput(java.lang.Object)
- */
- public void setInput(Object newInput) {
- if (newInput != null && newInput instanceof ManagedBeanType) {
- managedBean = (ManagedBeanType) newInput;
- if (managedBean.getListEntries() != null)
- refreshAll();
- }
-
- }
-
- /**
- *
- */
- public void refreshAll() {
- if (managedBean.getListEntries() != null
- && managedBean.getListEntries().getValueClass() != null) {
- this.valueClassField.setTextWithoutUpdate(managedBean
- .getListEntries().getValueClass().getTextContent());
- } else {
- valueClassField.setTextWithoutUpdate(null);
- }
- tableViewer.setInput(((ManagedBeanType) getInput()).getListEntries());
- updateButtons();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.wizards.IDialogFieldGroup#getInput()
- */
- public Object getInput() {
- return managedBean;
- }
-
- private IProject getProject() {
- if (currentProject == null) {
- currentProject = (IProject) section.getPage().getEditor()
- .getAdapter(IProject.class);
- }
- return currentProject;
- }
-
- public void setProject(IProject project) {
- currentProject = project;
- }
-
- public void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
- return null;
- }
-
- /**
- *
- */
- public void clearAll() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- // TODO Auto-generated method stub
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java
deleted file mode 100644
index fbacb250e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.DefaultLocaleType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.LocaleConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.SupportedLocaleType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-public class LocaleConfigSection extends ApplicationSection implements
- ICheckStateListener {
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public LocaleConfigSection(EClass componentClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(componentClass, parent, managedForm, page, toolkit,
- helpContextId, helpTooltip);
- }
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public LocaleConfigSection(EClass componentClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(componentClass, parent, managedForm, page, toolkit, null, null);
- }
-
- /**
- * create a CheckboxTableViewer for this section.
- */
- protected TableViewer createTableViewer(Composite parent) {
- CheckboxTableViewer tableViewer = CheckboxTableViewer.newCheckList(
- parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- tableViewer.addCheckStateListener(this);
- tableViewer.setSorter(new ViewerSorter());
- return tableViewer;
- }
-
- /**
- * Add a filter for this table viewer, only <supported-locale> and
- * <default-locale> elements would be listed.
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getSupportedLocaleType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getDefaultLocaleType()
- .isInstance(element);
- }
- });
- }
-
- /**
- * Pop up a dialog for user to select a locale string, then create a
- * <supported-locale> element with the string as value.
- *
- * @return
- */
- public SupportedLocaleType createSupportedLocaleObject() {
- ArrayList locales = new ArrayList();
-
- /**
- * Compute the locales that already declared in this <locale-config>
- * element. If user select a locale that already declared, then a
- * warning message will be shown in the dialog.
- */
-
- if (getInput() instanceof ApplicationType
- && ((ApplicationType) getInput()).getLocaleConfig().size() > 0) {
- LocaleConfigType localeConfigType = (LocaleConfigType) ((ApplicationType) getInput())
- .getLocaleConfig().get(0);
- if (localeConfigType.getDefaultLocale() != null) {
- String locale = localeConfigType.getDefaultLocale()
- .getTextContent();
- if (locale != null) {
- locales.add(locale);
- }
- }
- List list = localeConfigType.getSupportedLocale();
- for (int i = 0, n = list.size(); i < n; i++) {
- String locale = ((SupportedLocaleType) list.get(i))
- .getTextContent();
- if (locale != null) {
- locales.add(locale);
- }
- }
- }
- String result = DialogUtil.openLocaleDialog(getSection().getShell(),
- locales);
- if (result != null) {
- SupportedLocaleType component = FacesConfigFactory.eINSTANCE
- .createSupportedLocaleType();
- component.setTextContent(result);
- return component;
- }
- return null;
- }
-
- /**
- * When user click "Add" button on this section, pop up a dialog to create a
- * <supported-locale> element, then add it onto <locale-config> element, if
- * the <locale-config> or <application> doesn't exist, create them together.
- */
- void addButtonSelected(SelectionEvent e) {
- SupportedLocaleType obj = createSupportedLocaleObject();
- if (obj != null) {
-
- boolean needRefreshAll = false;
- Command command = null;
-
- if (getInput() instanceof ApplicationType) {
- /** the <application> element exists. */
- ApplicationType application = (ApplicationType) getInput();
- if (application.getLocaleConfig().size() > 0) {
- /** the <locale-config> element exists. */
- LocaleConfigType localeConfig = (LocaleConfigType) application
- .getLocaleConfig().get(0);
- command = AddCommand.create(this.getEditingDomain(),
- localeConfig, null, obj);
- } else {
- /** the <locale-config> element doesn't exist, create it. */
- LocaleConfigType localeConfig = FacesConfigFactory.eINSTANCE
- .createLocaleConfigType();
- localeConfig.getSupportedLocale().add(obj);
- command = AddCommand.create(getEditingDomain(),
- application, null, localeConfig);
- }
- } else {
- /**
- * the <application> element doesn't exist, then create it,
- * after execute, reset the input for all the application
- * sections.
- */
- needRefreshAll = true;
- ApplicationType application = FacesConfigFactory.eINSTANCE
- .createApplicationType();
- LocaleConfigType localeConfig = FacesConfigFactory.eINSTANCE
- .createLocaleConfigType();
- localeConfig.getSupportedLocale().add(obj);
- application.getLocaleConfig().add(localeConfig);
- command = AddCommand.create(getEditingDomain(), this.getPage()
- .getInput(), null, application);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll)
- /** reset input for all the application sections. */
- ((OthersPage) this.getPage()).resetApplicationInput();
- }
- }
-
- }
-
- /**
- * when user click on the CheckboxTableViewer, perform some actions to
- * set/unset <default-locale> and <supported-locale> elements.
- *
- * If an item is selected, that means it's a <default-locale>, otherwise
- * it's a <supported-locale>.
- *
- * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
- */
- public void checkStateChanged(CheckStateChangedEvent event) {
- boolean checked = event.getChecked();
-
- if (event.getElement() == null) {
- return;
- }
-
- EObject node = (EObject) event.getElement();
- LocaleConfigType localeConfigType = (LocaleConfigType) ((ApplicationType) getInput())
- .getLocaleConfig().get(0);
- CompoundCommand compoundCommand = new CompoundCommand();
-
- if (checked) {
- /** user checked one item, going to set it as <default-locale>. */
- if (localeConfigType.getDefaultLocale() != null) {
- /**
- * Change the <default-locale> value to <supported-locale>.
- */
- Command command = RemoveCommand.create(getEditingDomain(),
- localeConfigType, null, localeConfigType
- .getDefaultLocale());
-
- compoundCommand.append(command);
-
- SupportedLocaleType supportedLocale = FacesConfigFactory.eINSTANCE
- .createSupportedLocaleType();
- supportedLocale.setTextContent(localeConfigType
- .getDefaultLocale().getTextContent());
- command = AddCommand.create(getEditingDomain(),
- localeConfigType, FacesConfigPackage.eINSTANCE
- .getLocaleConfigType_SupportedLocale(),
- supportedLocale);
- compoundCommand.append(command);
- }
-
- /**
- * Change the selected item from <supported-locale> to
- * <default-locale>
- */
- SupportedLocaleType supportedLocale = (SupportedLocaleType) node;
- Command command = RemoveCommand.create(getEditingDomain(),
- localeConfigType, FacesConfigPackage.eINSTANCE
- .getLocaleConfigType_SupportedLocale(),
- supportedLocale);
- compoundCommand.append(command);
-
- DefaultLocaleType defaultLocale = FacesConfigFactory.eINSTANCE
- .createDefaultLocaleType();
- defaultLocale.setTextContent(supportedLocale.getTextContent());
- command = SetCommand
- .create(getEditingDomain(), localeConfigType,
- FacesConfigPackage.eINSTANCE
- .getLocaleConfigType_DefaultLocale(),
- defaultLocale);
- compoundCommand.append(command);
-
- } else {
- /**
- * User unchecked one item, going to change it from <default-locale>
- * to <supported-locale>.
- */
- DefaultLocaleType defaultLocale = (DefaultLocaleType) node;
- Command command = RemoveCommand.create(getEditingDomain(),
- localeConfigType, null, defaultLocale);
- compoundCommand.append(command);
-
- SupportedLocaleType supportedLocale = FacesConfigFactory.eINSTANCE
- .createSupportedLocaleType();
- supportedLocale.setTextContent(defaultLocale.getTextContent());
- command = AddCommand.create(getEditingDomain(), localeConfigType,
- null, supportedLocale);
- compoundCommand.append(command);
- }
-
- if (compoundCommand.canExecute()) {
- getEditingDomain().getCommandStack().execute(compoundCommand);
- this.refresh();
- setTableViewerCheckedState();
- }
- }
-
- /**
- * Set the checked state for items in the checkbox table viewer. This method
- * could be used for refresh the checked state of the table viewer.
- */
- private void setTableViewerCheckedState() {
- if (getInput() instanceof ApplicationType) {
- ApplicationType application = (ApplicationType) getInput();
- if (application.getLocaleConfig().size() > 0) {
-
- LocaleConfigType localeConfigType = (LocaleConfigType) application
- .getLocaleConfig().get(0);
- if (localeConfigType.getDefaultLocale() != null) {
- ((CheckboxTableViewer) getTableViewer()).setChecked(
- localeConfigType.getDefaultLocale(), true);
- }
- }
- }
- }
-
- /**
- * set the structuredViewer's input. Set the first LocaleConfig as input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof ApplicationType) {
- ApplicationType application = (ApplicationType) input;
- if (EcoreUtil.getExistingAdapter(application,
- LocaleConfigSection.class) == null) {
- application.eAdapters().add(new LocaleConfigAdapter());
- }
- if (application.getLocaleConfig().size() > 0) {
- tableViewer.setInput(application.getLocaleConfig().get(0));
- } else
- tableViewer.setInput(null);
- } else
- tableViewer.setInput(null);
-
- }
-
- public void refreshAll() {
- super.refreshAll();
- setTableViewerCheckedState();
- }
-
- /**
- * A listener that is be adapted on the input <application> element, to
- * listen the event that the first <locale-config> being created and
- * removed, then reset the input of the tabel viewer.
- *
- * @author sfshi
- *
- */
- class LocaleConfigAdapter extends AdapterImpl {
- public boolean isAdapterForType(Object type) {
- if (type == LocaleConfigSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getApplicationType_LocaleConfig()) {
- /**
- * a <locale-config> was created or removed, notify this
- * section to reset it's input.
- */
- setInput(getInput());
-
- }
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
deleted file mode 100644
index 16c22ab7f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField mbNameField;
-
- private ClassButtonDialogField mbClassField;
-
- private ComboDialogField mbScopeField;
-
- private ManagedBeanGeneralSectionAdapter managedBeanGeneralSectionAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ManagedBeanGeneralSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection().setText(
- EditorMessages.ManagedBeanGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ManagedBeanGeneralSection_Desc);
- }
-
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
-
- toolkit.paintBordersFor(container);
-
- createMBNameEntry(container, toolkit, numberOfColumns);
-
- createMBClassEntry(container, toolkit, numberOfColumns);
-
- createMBScopeEntry(container, toolkit, numberOfColumns);
-
- }
-
- /**
- * create managed bean's name editing field
- *
- * @param container
- * @param toolkit
- */
- private void createMBNameEntry(Composite container, FormToolkit toolkit,
- int numberOfColumns) {
- mbNameField = new StringDialogField();
- mbNameField
- .setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanName);//$NON-NLS-1$
- mbNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(mbNameField.getTextControl(toolkit,
- container));
- mbNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String mbNameValue = ((StringDialogField) field)
- .getText();
- Command cmd = null;
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- // if (managedBean.getManagedBeanName() != null) {
- // cmd = SetCommand
- // .create(
- // getEditingDomain(),
- // managedBean.getManagedBeanName(),
- // FacesConfigPackage.eINSTANCE
- // .getManagedBeanNameType_TextContent(),
- // mbNameValue);
- // } else {
- ManagedBeanNameType newManagedBeanName = FacesConfigFactory.eINSTANCE
- .createManagedBeanNameType();
- newManagedBeanName.setTextContent(mbNameValue);
- cmd = SetCommand.create(getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName(),
- newManagedBeanName);
- // }
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- }
- }
- });
- }
-
- /**
- * create managed bean's class field.
- *
- * @param container
- * @param toolkit
- */
- private void createMBClassEntry(final Composite container,
- final FormToolkit toolkit, int numberOfColumns) {
- mbClassField = new ClassButtonDialogField(null);
- mbClassField
- .setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanClass);//$NON-NLS-1$
- mbClassField.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- mbClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(mbClassField.getTextControl(toolkit,
- container));
-
- mbClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newValue = ((StringDialogField) field).getText();
- Command cmd = null;
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- // if (managedBean.getManagedBeanClass() != null) {
- // cmd = SetCommand
- // .create(
- // getEditingDomain(),
- // managedBean.getManagedBeanClass(),
- // FacesConfigPackage.eINSTANCE
- // .getManagedBeanClassType_TextContent(),
- // newValue);
- // } else {
- ManagedBeanClassType newManagedBeanClass = FacesConfigFactory.eINSTANCE
- .createManagedBeanClassType();
- newManagedBeanClass.setTextContent(newValue);
- cmd = SetCommand.create(getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass(),
- newManagedBeanClass);
- // }
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- }
- }
- });
- }
-
- /**
- * create managed bean's scope field
- *
- * @param container
- * @param toolkit
- */
- private void createMBScopeEntry(Composite container, FormToolkit toolkit,
- int numberOfColumns) {
- mbScopeField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
- mbScopeField
- .setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanScope);//$NON-NLS-1$
- mbScopeField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(mbScopeField.getComboControl(toolkit,
- container));
-
- mbScopeField.setItems(ManagedBeanScopeTreeItem.scopeItems);
-
- mbScopeField
- .setDialogFieldChangeListener(new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- String newValue = ((ComboDialogField) field).getText();
- Command cmd = null;
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- // if (managedBean.getManagedBeanScope() != null) {
- // cmd = SetCommand
- // .create(
- // getEditingDomain(),
- // managedBean.getManagedBeanScope(),
- // FacesConfigPackage.eINSTANCE
- // .getManagedBeanScopeType_TextContent(),
- // newValue);
- // } else {
- ManagedBeanScopeType newManagedBeanScope = FacesConfigFactory.eINSTANCE
- .createManagedBeanScopeType();
- newManagedBeanScope.setTextContent(newValue);
- cmd = SetCommand.create(getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope(),
- newManagedBeanScope);
- // }
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- }
- }
- });
- }
-
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ManagedBeanType) {
- ManagedBeanType component = (ManagedBeanType) input;
-
- if (component.getManagedBeanName() != null) {
- mbNameField.setTextWithoutUpdate(component.getManagedBeanName()
- .getTextContent());
- } else {
- mbNameField.setTextWithoutUpdate("");
- }
-
- if (component.getManagedBeanClass() != null) {
- mbClassField.setTextWithoutUpdate(component
- .getManagedBeanClass().getTextContent());
- } else {
- mbClassField.setTextWithoutUpdate("");
- }
-
- if (component.getManagedBeanScope() != null) {
- mbScopeField.setTextWithoutUpdate(component
- .getManagedBeanScope().getTextContent());
- } else {
- // defaultly set it's scope to "session";
- mbScopeField
- .setTextWithoutUpdate(IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION);
- }
- }
- }
-
- protected void addAdaptersOntoInput(Object newInput) {
- super.addAdaptersOntoInput(newInput);
- ManagedBeanType managedBean = (ManagedBeanType) newInput;
- if (EcoreUtil.getExistingAdapter(managedBean,
- ManagedBeanGeneralSection.class) == null) {
- managedBean.eAdapters().add(getManagedBeanGeneralSectionAdatper());
- }
-
- }
-
- protected void removeAdaptersFromInput(Object oldInput) {
- super.removeAdaptersFromInput(oldInput);
- ManagedBeanType managedBean = (ManagedBeanType) oldInput;
- if (EcoreUtil.getExistingAdapter(managedBean,
- ManagedBeanGeneralSection.class) != null) {
- managedBean.eAdapters().remove(
- getManagedBeanGeneralSectionAdatper());
- }
- }
-
- protected ManagedBeanGeneralSectionAdapter getManagedBeanGeneralSectionAdatper() {
- if (managedBeanGeneralSectionAdapter == null) {
- managedBeanGeneralSectionAdapter = new ManagedBeanGeneralSectionAdapter();
- }
- return managedBeanGeneralSectionAdapter;
- }
-
- class ManagedBeanGeneralSectionAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
-
- if (type == ManagedBeanGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope()) {
- refresh();
- }
- }
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
deleted file mode 100644
index de6ba02ed..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.provider.ManagedBeanContentProvider;
-import org.eclipse.jst.jsf.facesconfig.ui.provider.ManagedBeanLabelProvider;
-import org.eclipse.jst.jsf.facesconfig.ui.wizard.NewManagedBeanWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- */
-public class ManagedBeanMasterSection extends FacesConfigMasterSection {
-
- private ManagedBeanMasterSectionAdapter managedBeanMasterSectionAdapter;
-
- /**
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- */
- public ManagedBeanMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(
- EditorMessages.ManagedBeanMasterSection_Name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.ManagedBeanMasterSection_Description);
- }
-
- protected StructuredViewer createViewer(Composite parent,
- FormToolkit toolkit) {
- Composite treeContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(treeContainer);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- treeContainer.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- treeContainer.setLayout(layout);
-
- // Create tree viewer
- TreeViewer treeViewer = new TreeViewer(treeContainer, SWT.SINGLE
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- treeViewer.getControl().setLayoutData(gd);
-
- treeViewer.setContentProvider(new ManagedBeanContentProvider());
- treeViewer.setLabelProvider(new ManagedBeanLabelProvider());
- treeViewer.addSelectionChangedListener(this);
-
- treeViewer.setAutoExpandLevel(3);
- return treeViewer;
- }
-
- protected void addButtonSelected(SelectionEvent e) {
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
-
- NewManagedBeanWizard wizard = new NewManagedBeanWizard(project);
- IStructuredSelection selection = (IStructuredSelection) this
- .getSelection();
- if (selection.getFirstElement() instanceof ManagedBeanScopeTreeItem) {
- // if user is selecting a scope tree item, then use this scope as
- // the default scope for the new managed bean.
- ManagedBeanScopeTreeItem scopeTreeItem = (ManagedBeanScopeTreeItem) selection
- .getFirstElement();
- wizard.setDefaultScope(scopeTreeItem.getScope());
- }
-
- wizard.setForcePreviousAndNextButtons(true);
-
- Shell shell = EditorPlugin.getActiveShell();
- WizardDialog wizardDialog = new WizardDialog(shell, wizard);
- wizardDialog.create();
- wizardDialog.setBlockOnOpen(true);
- if (wizardDialog.open() == Window.OK) {
- ManagedBeanType managedBean = FacesConfigFactory.eINSTANCE
- .createManagedBeanType();
-
- ManagedBeanNameType name = FacesConfigFactory.eINSTANCE
- .createManagedBeanNameType();
- name.setTextContent(wizard.getManagedBeanName());
- managedBean.setManagedBeanName(name);
-
- ManagedBeanClassType clazz = FacesConfigFactory.eINSTANCE
- .createManagedBeanClassType();
- clazz.setTextContent(wizard.getManagedBeanClass());
- managedBean.setManagedBeanClass(clazz);
-
- ManagedBeanScopeType scope = FacesConfigFactory.eINSTANCE
- .createManagedBeanScopeType();
- scope.setTextContent(wizard.getManagedBeanScope());
- managedBean.setManagedBeanScope(scope);
-
- String desc = wizard.getManagedBeanDescription();
- if (desc != null && desc.trim().length() > 0) {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(wizard.getManagedBeanDescription());
- managedBean.getDescription().add(description);
- }
-
- Command cmd = AddCommand.create(getEditingDomain(), getInput(),
- null, managedBean);
- if (cmd.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(cmd);
- }
- }
-
- }
-
- protected void removeButtonSelected(SelectionEvent e) {
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- if (ssel.getFirstElement() instanceof ManagedBeanType) {
- ManagedBeanType element = (ManagedBeanType) ssel
- .getFirstElement();
- Command command = RemoveCommand.create(getEditingDomain(), this
- .getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_ManagedBean(), element);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
- }
- }
-
- protected void updateButtons() {
- IStructuredSelection ssel = (IStructuredSelection) getStructuredViewer()
- .getSelection();
- boolean isRemoveEnable = false;
- if (!ssel.isEmpty()) {
- Object s1 = ssel.getFirstElement();
- if (s1 instanceof ManagedBeanType) {
- isRemoveEnable = true;
- }
- }
- removeButton.setEnabled(isRemoveEnable);
- }
-
- /**
- * Override the super method to ignore the selection on ScopeTreeItem.
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- if (event != null
- && event.getSelection() != null
- && ((IStructuredSelection) event.getSelection())
- .getFirstElement() instanceof ManagedBeanScopeTreeItem) {
-
- event = new SelectionChangedEvent(this, StructuredSelection.EMPTY);
- }
- super.selectionChanged(event);
- updateButtons();
-
- }
-
- protected void addAdaptersOntoInput(Object newInput) {
- super.addAdaptersOntoInput(newInput);
-
- FacesConfigType facesConfig = (FacesConfigType) newInput;
- if (EcoreUtil.getExistingAdapter(facesConfig,
- ManagedBeanMasterSection.class) == null) {
-
- facesConfig.eAdapters().add(getManagedBeanMasterSectionAdapter());
- }
-
- List managedbeans = facesConfig.getManagedBean();
- for (Iterator it = managedbeans.iterator(); it.hasNext();) {
- ManagedBeanType managedbean = (ManagedBeanType) it.next();
- if (EcoreUtil.getExistingAdapter(managedbean,
- ManagedBeanMasterSection.class) == null) {
-
- managedbean.eAdapters().add(
- getManagedBeanMasterSectionAdapter());
- }
- }
- }
-
- protected void removeAdaptersFromInput(Object oldInput) {
- super.removeAdaptersFromInput(oldInput);
- FacesConfigType facesConfig = (FacesConfigType) oldInput;
- if (EcoreUtil.getExistingAdapter(facesConfig,
- ManagedBeanMasterSection.class) != null) {
-
- facesConfig.eAdapters()
- .remove(getManagedBeanMasterSectionAdapter());
- }
-
- List managedbeans = facesConfig.getManagedBean();
- for (Iterator it = managedbeans.iterator(); it.hasNext();) {
- ManagedBeanType managedbean = (ManagedBeanType) it.next();
- if (EcoreUtil.getExistingAdapter(managedbean,
- ManagedBeanMasterSection.class) != null) {
-
- managedbean.eAdapters().remove(
- getManagedBeanMasterSectionAdapter());
- }
- }
- }
-
- protected ManagedBeanMasterSectionAdapter getManagedBeanMasterSectionAdapter() {
- if (managedBeanMasterSectionAdapter == null) {
- managedBeanMasterSectionAdapter = new ManagedBeanMasterSectionAdapter();
- }
- return managedBeanMasterSectionAdapter;
- }
-
- class ManagedBeanMasterSectionAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ManagedBeanMasterSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
- super.notifyChanged(msg);
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_ManagedBean()) {
- if (msg.getEventType() == Notification.ADD) {
- EObject mbean = (EObject) msg.getNewValue();
- if (EcoreUtil.getExistingAdapter(mbean,
- ManagedBeanMasterSection.class) == null) {
-
- mbean.eAdapters().add(
- getManagedBeanMasterSectionAdapter());
- }
- Object parentElement = ((ITreeContentProvider) ((TreeViewer) getStructuredViewer())
- .getContentProvider()).getParent(mbean);
- ((TreeViewer) getStructuredViewer()).add(parentElement,
- mbean);
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- }
-
- if (msg.getEventType() == Notification.REMOVE) {
- Object mbean = msg.getOldValue();
- Object scopeItem = ((ITreeContentProvider) ((TreeViewer) getStructuredViewer())
- .getContentProvider()).getParent(mbean);
- ((TreeViewer) getStructuredViewer()).remove(scopeItem,
- new Object[] { mbean });
- }
-
- if (msg.getEventType() == Notification.SET) {
- Object mbean = msg.getNewValue();
- getStructuredViewer().refresh(mbean, true);
- }
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName()) {
-
- Object mbean = msg.getNotifier();
- getStructuredViewer().refresh(mbean, true);
-
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope()) {
-
- Object mbean = msg.getNotifier();
- getStructuredViewer().refresh();
- IStructuredSelection selection = new StructuredSelection(mbean);
- getStructuredViewer().setSelection(selection);
- }
-
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java
deleted file mode 100644
index 69f6016d0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-
-/**
- * @author Xiao-guang Zhang, sfshi
- * @version
- */
-public class ManagedBeanScopeTreeItem {
-
- public static final String[] scopeItems = {
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_REQUEST,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_APPLICATION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_NONE };
-
- private String scope;
-
- private FacesConfigType facesConfig;
-
- /**
- *
- * @param managedBeanScope
- * @param facesConfig
- */
- public ManagedBeanScopeTreeItem(String managedBeanScope,
- FacesConfigType facesConfig) {
- super();
- this.scope = managedBeanScope;
-
- this.facesConfig = facesConfig;
- }
-
- public Object getParent() {
- return facesConfig;
- }
-
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public String getScope() {
- return scope;
- }
-
- public List getChildren() {
- List result = new ArrayList();
- List managedBeans = facesConfig.getManagedBean();
- for (Iterator it = managedBeans.iterator(); it.hasNext();) {
- ManagedBeanType managedBean = (ManagedBeanType) it.next();
-
- if (managedBean.getManagedBeanScope() != null) {
- if (scope.equals(managedBean.getManagedBeanScope()
- .getTextContent())) {
- result.add(managedBean);
- }
- }
- }
-
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
deleted file mode 100644
index 96c9b5a2c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
+++ /dev/null
@@ -1,580 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditManagedPropertyDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- * @version
- */
-public class ManagedPropertyEditGroup extends DialogFieldGroup implements
- IDialogFieldGroup, ISelectionProvider, ISelectionChangedListener {
-
- private TableViewer tableViewer;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ManagedBeanType managedBean;
-
- private AbstractFacesConfigSection section;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- *
- */
- public ManagedPropertyEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- refresh();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- createGeneralClassPage(parent, toolkit);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
- return null;
- }
-
- /**
- * create general class initialization section
- *
- * @param container
- * @param toolkit
- */
- private void createGeneralClassPage(Composite container, FormToolkit toolkit) {
- Composite generalSection = toolkit.createComposite(container);
- generalSection.setLayoutData(new GridData(GridData.FILL_BOTH));
- toolkit.paintBordersFor(generalSection);
-
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- generalSection.setLayout(gl);
-
- createTableSection(generalSection, toolkit);
-
- createButtonsSection(generalSection, toolkit);
- }
-
- /**
- * create proeprty table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- // create property container
- Composite propertyContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- propertyContainer.setLayoutData(gd);
- toolkit.paintBordersFor(propertyContainer);
-
- GridLayout gl = new GridLayout();
- propertyContainer.setLayout(gl);
-
- // Create property table
- Table table = new Table(propertyContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableColumn propertyCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- propertyCol
- .setText(EditorMessages.InitializationSection_PropertyTable_Name);
- propertyCol.setResizable(true);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol
- .setText(EditorMessages.InitializationSection_PropertyTable_Class);
- classCol.setResizable(true);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.InitializationSection_PropertyTable_Value);
- valueCol.setResizable(true);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- section.getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(section
- .getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getManagedPropertyType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create property's editing buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- // create list operation buttons
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
-
- }
-
- protected void addButtonSelected() {
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditManagedPropertyDialog dialog = new AddEditManagedPropertyDialog(
- shell, managedBean, section);
- if (dialog.open() == Dialog.OK) {
-
- ManagedPropertyType managedProperty = createManagedPropertyFromDialog(dialog);
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedProperty(),
- managedProperty);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- protected void editButtonSelected() {
- ManagedPropertyType managedProperty = (ManagedPropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- Shell shell = EditorPlugin.getActiveShell();
- AddEditManagedPropertyDialog dialog = new AddEditManagedPropertyDialog(
- shell, managedProperty, section);
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList();
- String propertyName = dialog.getPropertyName();
- String propertyClass = dialog.getPropertyClass();
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(propertyName);
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_PropertyName(),
- propertyNameType);
- commands.add(cmd1);
-
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(propertyClass);
- Command cmd2 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_PropertyClass(),
- propertyClassType);
- commands.add(cmd2);
-
- // remove value, null-value, map-entries and list-entries element:
- if (managedProperty.getNullValue() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_NullValue(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
- if (managedProperty.getListEntries() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_ListEntries(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
- if (managedProperty.getValue() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_Value(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
- if (managedProperty.getMapEntries() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_MapEntries(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
-
- Object valueObject = dialog.getValueObject();
- if (valueObject != null) {
- String valueType = dialog.getValueType();
- if (valueType.equals(IFacesConfigConstants.VALUE)) {
-
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) valueObject);
- managedProperty.setValue(value);
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_Value(), value);
- commands.add(cmd3);
-
- } else if (valueType.equals(IFacesConfigConstants.MAP_ENTRIES)) {
-
- MapEntriesType mapEntriesType = (MapEntriesType) valueObject;
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_MapEntries(),
- mapEntriesType);
- commands.add(cmd3);
- } else if (valueType.equals(IFacesConfigConstants.LIST_ENTRIES)) {
-
- ListEntriesType listEntriesType = (ListEntriesType) valueObject;
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_ListEntries(),
- listEntriesType);
- commands.add(cmd3);
- } else if (valueType.equals(IFacesConfigConstants.NULL_VALUE)) {
-
- NullValueType nullValue = (NullValueType) valueObject;
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_NullValue(),
- nullValue);
- commands.add(cmd3);
- }
- }
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
- }
-
- protected ManagedPropertyType createManagedPropertyFromDialog(
- AddEditManagedPropertyDialog dialog) {
-
- String propertyName = dialog.getPropertyName();
- String propertyClass = dialog.getPropertyClass();
-
- ManagedPropertyType managedProperty = FacesConfigFactory.eINSTANCE
- .createManagedPropertyType();
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(propertyName);
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(propertyClass);
- managedProperty.setPropertyName(propertyNameType);
- managedProperty.setPropertyClass(propertyClassType);
-
- Object valueObject = dialog.getValueObject();
- if (valueObject != null) {
- String valueType = dialog.getValueType();
- if (valueType.equals(IFacesConfigConstants.VALUE)) {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) valueObject);
- managedProperty.setValue(value);
- } else if (valueType.equals(IFacesConfigConstants.MAP_ENTRIES)) {
- MapEntriesType mapEntriesType = (MapEntriesType) dialog
- .getValueObject();
- managedProperty.setMapEntries(mapEntriesType);
- } else if (valueType.equals(IFacesConfigConstants.LIST_ENTRIES)) {
- ListEntriesType listEntriesType = (ListEntriesType) dialog
- .getValueObject();
- managedProperty.setListEntries(listEntriesType);
- } else if (valueType.equals(IFacesConfigConstants.NULL_VALUE)) {
- NullValueType nullValue = (NullValueType) dialog
- .getValueObject();
- managedProperty.setNullValue(nullValue);
- }
- }
- return managedProperty;
- }
-
- protected void removeButtonSelected() {
- ManagedPropertyType managedProperty = (ManagedPropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- Assert.isNotNull(managedProperty);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedProperty(), managedProperty);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
- }
-
- public void setInput(Object newInput) {
- if (newInput != null && newInput instanceof ManagedBeanType) {
- managedBean = (ManagedBeanType) newInput;
- refreshAll();
- }
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- *
- */
- public void refresh() {
- tableViewer.refresh();
- updateButtons();
- }
-
- public Object getInput() {
- return managedBean;
- }
-
- public EditingDomain getEditingDomain() {
- return section.getEditingDomain();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- // TODO Auto-generated method stub
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
deleted file mode 100644
index 83e943998..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntryType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditMapEntryDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * MapEntries Editing DialogFieldGroup
- *
- * @author sfshi
- * @version
- */
-public class MapEntriesEditGroup extends DialogFieldGroup implements
- IDialogFieldGroup, ISelectionProvider, ISelectionChangedListener {
- private ClassButtonDialogField keyClassField;
-
- private ClassButtonDialogField valueClassField;
-
- private TableViewer tableViewer;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private IProject currentProject;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ManagedBeanType managedBean;
-
- private AbstractFacesConfigSection section;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- */
- public MapEntriesEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- }
-
- public void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- GridData data = new GridData(GridData.FILL_BOTH);
- parent.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.marginHeight = 0;
- parent.setLayout(gl);
-
- layoutMapTypeSelectionSection(toolkit, parent);
-
- createAndLayoutMapValueSection(toolkit, parent);
- }
-
- /**
- *
- */
- private void layoutMapTypeSelectionSection(FormToolkit toolkit,
- Composite container) {
-
- Composite typeSelectionSection = null;
- if (toolkit != null) {
- typeSelectionSection = toolkit.createComposite(container);
- toolkit.paintBordersFor(typeSelectionSection);
- } else {
- typeSelectionSection = SWTUtils
- .createComposite(container, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
- keyClassField = new ClassButtonDialogField(getProject());
- keyClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_KeyClass);
- keyClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- KeyClassType keyClass = FacesConfigFactory.eINSTANCE
- .createKeyClassType();
- keyClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean.getMapEntries() == null) {
- isNew = true;
- MapEntriesType mapEntries = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntries.setKeyClass(keyClass);
- cmd = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntries);
- } else {
- isNew = false;
- cmd = SetCommand.create(editingDomain, managedBean
- .getMapEntries(),
- FacesConfigPackage.eINSTANCE
- .getMapEntriesType_KeyClass(),
- keyClass);
- }
-
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- if (isNew)
- refreshAll();
- }
-
- }
- });
-
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);
- valueClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean.getMapEntries() == null) {
- isNew = true;
- MapEntriesType mapEntries = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntries.setValueClass(valueClass);
- cmd = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntries);
- } else {
- isNew = false;
- cmd = SetCommand.create(editingDomain, managedBean
- .getMapEntries(),
- FacesConfigPackage.eINSTANCE
- .getMapEntriesType_ValueClass(),
- valueClass);
- }
-
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- if (isNew)
- refreshAll();
- }
-
- }
- });
-
- keyClassField.doFillIntoGrid(toolkit, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(keyClassField.getTextControl(toolkit,
- container));
-
- valueClassField.doFillIntoGrid(toolkit, typeSelectionSection,
- numberOfColumns);
- }
-
- /**
- * @param toolkit
- * @param parent
- */
- private void createAndLayoutMapValueSection(FormToolkit toolkit,
- Composite parent) {
- Composite mapValueSection = null;
- if (toolkit != null) {
- mapValueSection = toolkit.createComposite(parent);
- toolkit.paintBordersFor(mapValueSection);
- } else {
- mapValueSection = SWTUtils.createComposite(parent, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- mapValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- mapValueSection.setLayout(gl);
- DialogField valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$
-
- valuesTitle.doFillIntoGrid(toolkit, mapValueSection, numberOfColumns);
- Table table;
- if (toolkit == null) {
- table = new Table(mapValueSection, SWT.FULL_SELECTION
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- } else {
- table = new Table(mapValueSection, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- }
-
- table.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
-
- }
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn keyCol = new TableColumn(table, SWT.NONE);
- keyCol
- .setText(EditorMessages.InitializationSection_MapTable_Key);//$NON-NLS-1$
- layout.addColumnData(new ColumnWeightData(1, true));
- keyCol.setResizable(true);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
- valueCol.setResizable(true);
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- section.getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(section
- .getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getMapEntryType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
-
- Composite operationContainer = null;
- if (toolkit != null) {
- operationContainer = toolkit.createComposite(mapValueSection);
- } else {
- operationContainer = SWTUtils.createComposite(mapValueSection,
- SWT.NONE);
- }
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = null;
- if (toolkit != null) {
- addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
- SWT.PUSH);
- } else {
- addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- if (toolkit != null) {
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, SWT.PUSH);
- } else {
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more); //$NON-NLS-1$
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- if (toolkit != null) {
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- } else {
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove); //$NON-NLS-1$
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
- }
-
- protected void addButtonSelected() {
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), true);
- if (dialog.open() == Dialog.OK) {
- MapEntryType mapEntry = FacesConfigFactory.eINSTANCE
- .createMapEntryType();
- if (dialog.getKey() != null) {
- KeyType key = FacesConfigFactory.eINSTANCE.createKeyType();
- key.setTextContent(dialog.getKey());
- mapEntry.setKey(key);
- }
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- mapEntry.setNullValue(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- mapEntry.setValue(value);
- }
-
- EditingDomain editingDomain = section.getEditingDomain();
- Command command;
- boolean isNewMapEntries = false;
- if (managedBean.getMapEntries() == null) {
- MapEntriesType mapEntriesType = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntriesType.getMapEntry().add(mapEntry);
- command = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntriesType);
- isNewMapEntries = true;
- } else {
- MapEntriesType mapEntries = managedBean.getMapEntries();
-
- command = AddCommand.create(editingDomain, mapEntries,
- FacesConfigPackage.eINSTANCE
- .getMapEntriesType_MapEntry(), mapEntry);
- }
-
- if (command.canExecute()) {
- editingDomain.getCommandStack().execute(command);
- if (isNewMapEntries)
- refreshAll();
- }
-
- }
- }
-
- protected void editButtonSelected() {
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), false);
- if (mapEntry.getKey() != null)
- dialog.setKey(mapEntry.getKey().getTextContent());
- if (mapEntry.getNullValue() != null)
- dialog.setNullValue(true);
- else if (mapEntry.getValue() != null)
- dialog.setValue(mapEntry.getValue().getTextContent());
-
- if (dialog.open() == Dialog.OK) {
- EditingDomain editingDomain = section.getEditingDomain();
- List commands = new ArrayList();
-
- if (mapEntry.getKey() != null) {
- Command cmd1 = SetCommand.create(editingDomain, mapEntry
- .getKey(), FacesConfigPackage.eINSTANCE
- .getKeyType_TextContent(), dialog.getKey());
- commands.add(cmd1);
-
- } else {
- KeyType keyType = FacesConfigFactory.eINSTANCE.createKeyType();
- keyType.setTextContent(dialog.getKey());
- Command cmd2 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE.getMapEntryType_Key(),
- keyType);
- commands.add(cmd2);
- }
-
- if (dialog.isNullValue()) {
- if (mapEntry.getValue() != null) {
- Command cmd3 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_Value(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd3);
- }
- Command cmd4 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_NullValue(),
- FacesConfigFactory.eINSTANCE.createNullValueType());
-
- commands.add(cmd4);
- } else {
- if (mapEntry.getNullValue() != null) {
- Command cmd5 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_NullValue(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd5);
- }
-
- if (mapEntry.getValue() != null) {
- Command cmd6 = SetCommand.create(editingDomain, mapEntry
- .getValue(), FacesConfigPackage.eINSTANCE
- .getValueType_TextContent(), dialog.getValue());
- commands.add(cmd6);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- Command cmd7 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_Value(), value);
- commands.add(cmd7);
- }
-
- }
-
- Command command = new CompoundCommand(commands);
- if (command.canExecute()) {
- editingDomain.getCommandStack().execute(command);
- tableViewer.refresh(mapEntry);
- }
-
- }
-
- }
-
- protected void removeButtonSelected() {
-
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- EditingDomain editingDomain = section.getEditingDomain();
- Command cmd = RemoveCommand.create(editingDomain, mapEntry);
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- refresh();
- }
- }
-
- /**
- * get the project according to current xml node.
- *
- * @return
- */
- private IProject getProject() {
- if (currentProject == null) {
- currentProject = (IProject) section.getPage().getEditor()
- .getAdapter(IProject.class);
- }
- return currentProject;
- }
-
- public void setProject(IProject project) {
- currentProject = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IDialogFieldGroup#setInput(java.lang.Object)
- */
- public void setInput(Object newInput) {
- if (newInput != null && newInput instanceof ManagedBeanType) {
- managedBean = (ManagedBeanType) newInput;
- if (managedBean.getMapEntries() != null)
- refreshAll();
- }
- }
-
- public void refreshAll() {
- if (managedBean.getMapEntries() != null
- && managedBean.getMapEntries().getKeyClass() != null) {
- this.keyClassField.setTextWithoutUpdate(managedBean.getMapEntries()
- .getKeyClass().getTextContent());
- } else {
- this.keyClassField.setTextWithoutUpdate(null);
- }
-
- if (managedBean.getMapEntries() != null
- && managedBean.getMapEntries().getValueClass() != null) {
- this.valueClassField.setTextWithoutUpdate(managedBean
- .getMapEntries().getValueClass().getTextContent());
- } else {
- this.valueClassField.setTextWithoutUpdate(null);
- }
-
- tableViewer.setInput(((ManagedBeanType) getInput()).getMapEntries());
- updateButtons();
- }
-
- public Object getInput() {
- return this.managedBean;
- }
-
- public void refreshData() {
- refresh();
-
- }
-
- /**
- *
- */
- public void refresh() {
- tableViewer.refresh();
- updateButtons();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- // TODO Auto-generated method stub
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
deleted file mode 100644
index fb2e310d3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-/**
- * The base class for the Sections in Others Page.
- */
-public abstract class OthersPageBaseSection extends AbstractFacesConfigSection {
-
- protected TableViewer tableViewer;
-
- protected Button removeButton;
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public OthersPageBaseSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit, String helpContextId,
- String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- }
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OthersPageBaseSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- this(parent, managedForm, page, toolkit, null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#createContents(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.forms.widgets.FormToolkit)
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- createViewer(container, toolkit);
- createOperationSection(container, toolkit);
- }
-
- /**
- * create TableViewer for this section. sub-class may override it to return
- * a new type tableViewer. for example CheckboxTableViewer.
- *
- * @param parent
- * @return
- */
- protected TableViewer createTableViewer(Composite parent) {
- return new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.BORDER);
- }
-
- /**
- * Config the viewer, such as set a filter and so on. Sub classes should
- * override this method to add filter.
- *
- * @param tableViewer
- */
- protected void configTableViewer(TableViewer tableViewer) {
- }
-
- /**
- *
- * @param parent
- * @param toolkit
- */
- protected void createViewer(Composite parent, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(tableContainer);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tableContainer.setLayoutData(gd);
- tableContainer.setLayout(new GridLayout());
-
- tableViewer = createTableViewer(tableContainer);
- tableViewer.getControl()
- .setLayoutData(new GridData(GridData.FILL_BOTH));
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
- configTableViewer(tableViewer);
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- *
- * @param parent
- * @param toolkit
- */
- protected void createOperationSection(Composite parent, FormToolkit toolkit) {
- Composite operationContainer = toolkit.createComposite(parent);
- operationContainer.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-
- operationContainer.setLayout(new GridLayout());
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add, SWT.PUSH);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, SWT.PUSH);
-
- removeButton.setEnabled(true);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
- });
- }
-
-
- abstract void addButtonSelected(SelectionEvent e);
-
- protected void removeButtonSelected(SelectionEvent e) {
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- List commands = new ArrayList(ssel.size());
- for (Iterator iter = ssel.iterator(); iter.hasNext();) {
- EObject element = (EObject) iter.next();
- if (element.eContainer().eContents().size() == 1) {
- // if the parent only have this one child, then remove it
- // together.
- element = element.eContainer();
- }
- Command command = RemoveCommand.create(getEditingDomain(),
- element);
- commands.add(command);
-
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
- }
-
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
- protected void updateButtons() {
- if (!removeButton.isDisposed()) {
- IStructuredSelection ssel = (IStructuredSelection) getSelection();
- removeButton.setEnabled(!ssel.isEmpty());
- }
- }
-
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- public void setSelection(ISelection selection) {
- tableViewer.setSelection(selection);
- }
-
- /**
- * @return Returns the tableViewer.
- */
- public TableViewer getTableViewer() {
- return tableViewer;
- }
-
- public void refreshAll() {
- setViewerInput(getInput());
- updateButtons();
- }
-
- /**
- * set the structuredViewer's input
- *
- * @param input
- */
- abstract protected void setViewerInput(Object input);
-
- public void expansionStateChanged(boolean expanded) {
- if (expanded) {
- if (tableViewer.getInput() == null) {
- refreshAll();
- }
- tableViewer.setSelection(tableViewer.getSelection());
- } else {
- tableViewer.setSelection(null);
- }
- super.expansionStateChanged(expanded);
- }
-
- protected void expansionStateChanging(boolean expanding) {
- if (!expanding) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- this.getSection().setLayoutData(gd);
- } else {
- ((OthersPage) getPage()).closeOtherSections(this);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- this.getSection().setLayoutData(gd);
- }
-
- super.expansionStateChanging(expanding);
- }
-
- public void clearAll() {
-
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- super.selectionChanged(event);
- updateButtons();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
deleted file mode 100644
index 41103d6b4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- * @version
- */
-public class OverviewComponentsSection extends AbstractOverviewSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewComponentsSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, ComponentsPage.PAGE_ID,
- EditorMessages.OverviewPage_ComponentsSection_name,
- EditorMessages.OverviewPage_ComponentsSection_description,
- null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getComponentType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(element);
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable(org.eclipse.swt.widgets.Composite)
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn typecol = new TableColumn(table, SWT.LEFT);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- typecol
- .setText(EditorMessages.OverviewPage_ComponentsSection_table_typecol);
- typecol.setResizable(true);
-
- TableColumn namecol = new TableColumn(table, SWT.LEFT);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- namecol
- .setText(EditorMessages.OverviewPage_ComponentsSection_table_namecol);
- namecol.setResizable(true);
-
- return table;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
deleted file mode 100644
index fba5fd8aa..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author jchoi, Xiao-guang Zhang
- * @version
- */
-public class OverviewGeneralSection extends AbstractFacesConfigSection {
-
- private Text versionText;
-
- /**
- * @param parent
- * @param toolkit
- * @param style
- */
- public OverviewGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
-
- getSection().setText(
- EditorMessages.OverviewPage_GeneralSection_name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.OverviewPage_GeneralSection_description); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.update.ui.forms.internal.FormSection#createClient(org.eclipse.swt.widgets.Composite,
- * org.eclipse.update.ui.forms.internal.FormWidgetFactory)
- */
- public void createContents(Composite container, FormToolkit toolkit) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- container.setLayout(layout);
-
- IEditorInput editorInput = this.getPage().getEditor().getEditorInput();
-
- toolkit.createLabel(container,
- EditorMessages.OverviewPage_GeneralSection_label_name); //$NON-NLS-1$
- Text typeText = toolkit.createText(container, ((FileEditorInput)editorInput).getName());
- typeText.setEditable(false);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- typeText.setLayoutData(data);
-
- toolkit.createLabel(container,
- EditorMessages.OverviewPage_GeneralSection_label_version); //$NON-NLS-1$
- versionText = toolkit.createText(container, "");
- versionText.setLayoutData(data);
- versionText.setEditable(false);
-
- // set the service type description
- data = new GridData(GridData.FILL_HORIZONTAL);
- versionText.setLayoutData(data);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- Label sep = toolkit.createSeparator(container, SWT.HORIZONTAL);
- sep.setLayoutData(gd);
- toolkit.paintBordersFor(container);
-
- // return container;
- }
-
- public void refreshAll() {
- if (getInput() == null || !(getInput() instanceof EObject)) {
- return;
- }
-
-// FacesConfigType facesConfig = (FacesConfigType)getInput();
- // TODO get the version and display it.
- // String version = FacesConfigUtil
- // .getFacesConfigVersion((IDOMModel) getInput());
- //
- // if (null == version) {
- // Document document = ((IDOMModel) getInput()).getDocument();
- // DocumentType doctype = document.getDoctype();
- // if (doctype != null) {
- // String pid = doctype.getPublicId();
- // version = pid.substring(PUBLIC_ID.length() + 1);
- // version = version.substring(version.indexOf(VERSION_PREFIX)
- // + VERSION_PREFIX.length() + 1, version.indexOf("//"));
- // }
- // if (null == version) {
- // version = "";
- // }
- // }
- // versionText.setText(version);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#clearAll()
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
deleted file mode 100644
index b3273ac50..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- * @version
- */
-public class OverviewManagedBeanSection extends AbstractOverviewSection {
-
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewManagedBeanSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, ManagedBeanPage.PAGE_ID,
- EditorMessages.OverviewPage_ManagedBeanSection_name,
- EditorMessages.OverviewPage_ManagedBeanSection_description,
- null, null);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getManagedBeanType()
- .isInstance(element);
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable()
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn namecol = new TableColumn(table, SWT.LEFT);
- namecol
- .setText(EditorMessages.OverviewPage_ManagedBeanSection_table_namecol);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- namecol.setResizable(true);
-
- TableColumn scopecol = new TableColumn(table, SWT.LEFT);
- scopecol
- .setText(EditorMessages.OverviewPage_ManagedBeanSection_table_scopecol);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- scopecol.setResizable(true);
-
- TableColumn classcol = new TableColumn(table, SWT.LEFT);
- classcol
- .setText(EditorMessages.OverviewPage_ManagedBeanSection_table_classcol);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- classcol.setResizable(true);
-
- return table;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
deleted file mode 100644
index 3b972148a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- *
- */
-public class OverviewNavigationSection extends AbstractOverviewSection {
-
- private static final int COLUMN_WITH = 70;
-
- private OverviewNavigationSectionAdapter overviewNavigationSectionAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewNavigationSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, PageflowEditor.PAGE_ID,
- EditorMessages.OverviewPage_NavigationSection_name,
- EditorMessages.OverviewPage_NavigationSection_description,
- null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.setContentProvider(new IStructuredContentProvider() {
-
- public Object[] getElements(Object inputElement) {
- List navigationCaseList = (List) inputElement;
- return navigationCaseList.toArray();
- }
-
- public void dispose() {
-
- }
-
- public void inputChanged(Viewer viewer, Object oldInput,
- Object newInput) {
-
- }
- });
-
- tableViewer.setLabelProvider(new ITableLabelProvider() {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- NavigationCaseType navigationCase = (NavigationCaseType) element;
- switch (columnIndex) {
-
- case 0:
- return ((NavigationRuleType) navigationCase.eContainer())
- .getFromViewId() == null ? ""
- : ((NavigationRuleType) navigationCase.eContainer())
- .getFromViewId().getTextContent();
-
- case 1:
- return navigationCase.getFromOutcome() == null ? ""
- : navigationCase.getFromOutcome().getTextContent();
-
- case 2:
- return navigationCase.getToViewId() == null ? ""
- : navigationCase.getToViewId().getTextContent();
- }
- return null;
- }
-
- public void addListener(ILabelProviderListener listener) {
-
- }
-
- public void dispose() {
-
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
-
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable(org.eclipse.swt.widgets.Composite)
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn column1 = new TableColumn(table, SWT.LEFT);
- column1
- .setText(EditorMessages.OverviewPage_NavigationSection_table_col1);
- // column1.setWidth(COLUMN_WITH);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- // tablelayout.addColumnData(new ColumnWeightData(1, true));
- column1.setResizable(true);
-
- TableColumn column2 = new TableColumn(table, SWT.LEFT);
- column2
- .setText(EditorMessages.OverviewPage_NavigationSection_table_col2);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- // tablelayout.addColumnData(new ColumnWeightData(1, true));
- column2.setResizable(true);
- // column2.setWidth(COLUMN_WITH);
-
- TableColumn column3 = new TableColumn(table, SWT.LEFT);
- column3
- .setText(EditorMessages.OverviewPage_NavigationSection_table_col3);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- // tablelayout.addColumnData(new ColumnWeightData(1, true));
- column3.setResizable(true);
- // column3.setWidth(COLUMN_WITH);
-
- return table;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#refreshAll()
- */
- public void refreshAll() {
- List navigationCaseList = new ArrayList();
- if (getInput() instanceof FacesConfigType) {
- List navigationRules = ((FacesConfigType) getInput())
- .getNavigationRule();
- for (int i = 0, n = navigationRules.size(); i < n; i++) {
- NavigationRuleType navigationRule = (NavigationRuleType) navigationRules
- .get(i);
- navigationCaseList.addAll(navigationRule.getNavigationCase());
- }
- }
-
- tableViewer.setInput(navigationCaseList);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#addAdaptersOntoInput(java.lang.Object)
- */
- protected void addAdaptersOntoInput(Object newInput) {
- FacesConfigType facesConfig = (FacesConfigType) newInput;
- addOverviewNavigationSectionAdapter(facesConfig);
-
- for (Iterator it = facesConfig.getNavigationRule().iterator(); it
- .hasNext();) {
- NavigationRuleType navigationRule = (NavigationRuleType) it.next();
-
- addOverviewNavigationSectionAdapter(navigationRule);
-
- if (navigationRule.getFromViewId() != null) {
- addOverviewNavigationSectionAdapter(navigationRule
- .getFromViewId());
- }
-
- for (Iterator it2 = navigationRule.getNavigationCase().iterator(); it2
- .hasNext();) {
- NavigationCaseType navigationCase = (NavigationCaseType) it2
- .next();
- addOverviewNavigationSectionAdapter(navigationCase);
-
- if (navigationCase.getFromOutcome() != null) {
- addOverviewNavigationSectionAdapter(navigationCase
- .getFromOutcome());
- }
-
- if (navigationCase.getToViewId() != null) {
- addOverviewNavigationSectionAdapter(navigationCase
- .getToViewId());
- }
- }
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#removeAdaptersFromInput(java.lang.Object)
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- super.removeAdaptersFromInput(oldInput);
-
- FacesConfigType facesConfig = (FacesConfigType) oldInput;
- removeOverviewNavigationSectionAdapter(facesConfig);
-
- for (Iterator it = facesConfig.getNavigationRule().iterator(); it
- .hasNext();) {
- NavigationRuleType navigationRule = (NavigationRuleType) it.next();
-
- removeOverviewNavigationSectionAdapter(navigationRule);
-
- if (navigationRule.getFromViewId() != null) {
- removeOverviewNavigationSectionAdapter(navigationRule
- .getFromViewId());
- }
-
- for (Iterator it2 = navigationRule.getNavigationCase().iterator(); it2
- .hasNext();) {
- NavigationCaseType navigationCase = (NavigationCaseType) it2
- .next();
- removeOverviewNavigationSectionAdapter(navigationCase);
-
- if (navigationCase.getFromOutcome() != null) {
- removeOverviewNavigationSectionAdapter(navigationCase
- .getFromOutcome());
- }
-
- if (navigationCase.getToViewId() != null) {
- removeOverviewNavigationSectionAdapter(navigationCase
- .getToViewId());
- }
- }
- }
-
- }
-
- protected void addOverviewNavigationSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object,
- OverviewNavigationSection.class) == null) {
- object.eAdapters().add(getOverviewNavigationSectionAdapter());
- }
-
- }
-
- protected void removeOverviewNavigationSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object,
- OverviewNavigationSection.class) != null) {
- object.eAdapters().remove(getOverviewNavigationSectionAdapter());
- }
- }
-
- protected OverviewNavigationSectionAdapter getOverviewNavigationSectionAdapter() {
- if (overviewNavigationSectionAdapter == null)
- overviewNavigationSectionAdapter = new OverviewNavigationSectionAdapter();
- return overviewNavigationSectionAdapter;
- }
-
- class OverviewNavigationSectionAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == OverviewNavigationSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if ((msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_NavigationCase()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_FromViewId() || msg
- .getFeature() == FacesConfigPackage.eINSTANCE
- .getFromViewIdType_TextContent())) {
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.SET) {
- if (msg.getNewValue() instanceof EObject) {
- EObject newObject = (EObject) msg.getNewValue();
- addOverviewNavigationSectionAdapter(newObject);
- }
- }
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET)
- refreshAll();
- return;
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_FromOutcome()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_ToViewId()) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.SET) {
- if (msg.getNewValue() instanceof EObject) {
- EObject newObject = (EObject) msg.getNewValue();
- addOverviewNavigationSectionAdapter(newObject);
- }
- }
- if (msg.getEventType() == Notification.ADD
-
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
-
- NavigationCaseType navigationCase = (NavigationCaseType) msg
- .getNotifier();
- tableViewer.refresh(navigationCase);
- }
- return;
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFromOutcomeType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getToViewIdType_TextContent()) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- NavigationCaseType navigationCase = (NavigationCaseType) ((EObject) msg
- .getNotifier()).eContainer();
- tableViewer.refresh(navigationCase);
- }
- return;
- }
-
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
deleted file mode 100644
index 11ee5b278..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
-import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- *
- */
-public class OverviewOthersSection extends AbstractOverviewSection {
-
- private static final int COLUMN_WITH = 100;
-
- private OverviewOthersSectionAdapter overviewOthersSectionAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewOthersSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, OthersPage.PAGE_ID,
- EditorMessages.OverviewPage_OthersSection_name,
- EditorMessages.OverviewPage_OthersSection_description,
- null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer) {
- tableViewer.setContentProvider(new IStructuredContentProvider() {
-
- public Object[] getElements(Object inputElement) {
- List othersNodesList = (List) inputElement;
- return othersNodesList.toArray();
- }
-
- public void dispose() {
-
- }
-
- public void inputChanged(Viewer viewer, Object oldInput,
- Object newInput) {
-
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable(org.eclipse.swt.widgets.Composite)
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn valuecol = new TableColumn(table, SWT.NONE);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- valuecol
- .setText(EditorMessages.OverviewPage_OthersSection_table_valuecol);
- valuecol.setResizable(true);
-
- TableColumn typecol = new TableColumn(table, SWT.NONE);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- typecol
- .setText(EditorMessages.OverviewPage_OthersSection_table_typecol);
- typecol.setResizable(true);
-
- return table;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#refreshAll()
- */
- public void refreshAll() {
-
- List othersNodesList = new ArrayList();
- if (getInput() instanceof FacesConfigType) {
- Object[] applicationNodes = null;
- Object[] factoryNodes = null;
- Object[] lifecycleNodes = null;
- FacesConfigType facesConfig = (FacesConfigType) getInput();
- IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
- getAdapterFactory());
- if (facesConfig.getApplication().size() > 0) {
-
- ApplicationType application = (ApplicationType) facesConfig
- .getApplication().get(0);
- applicationNodes = contentProvider.getElements(application);
-
- }
-
- if (facesConfig.getFactory().size() > 0) {
- FactoryType factory = (FactoryType) facesConfig.getFactory()
- .get(0);
- factoryNodes = contentProvider.getElements(factory);
- }
-
- if (facesConfig.getLifecycle().size() > 0) {
- LifecycleType lifecycle = (LifecycleType) facesConfig
- .getLifecycle().get(0);
- lifecycleNodes = contentProvider.getElements(lifecycle);
- }
-
- if (applicationNodes != null) {
- for (int i = 0, n = applicationNodes.length; i < n; i++) {
- othersNodesList.add(applicationNodes[i]);
- }
- }
-
- if (factoryNodes != null) {
- for (int i = 0, n = factoryNodes.length; i < n; i++) {
- othersNodesList.add(factoryNodes[i]);
- }
- }
-
- if (lifecycleNodes != null) {
- for (int i = 0, n = lifecycleNodes.length; i < n; i++) {
- othersNodesList.add(lifecycleNodes[i]);
- }
- }
- }
-
- tableViewer.setInput(othersNodesList);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#addAdaptersOntoInput(java.lang.Object)
- */
- protected void addAdaptersOntoInput(Object newInput) {
- FacesConfigType facesConfig = (FacesConfigType) newInput;
- addOverviewOthersSectionAdapter(facesConfig);
- IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
- getAdapterFactory());
- if (facesConfig.getApplication().size() > 0) {
- ApplicationType application = (ApplicationType) facesConfig
- .getApplication().get(0);
- addOverviewOthersSectionAdapter(application);
-
- Object[] applicationNodes = contentProvider
- .getElements(application);
- for (int i = 0, n = applicationNodes.length; i < n; i++) {
- addOverviewOthersSectionAdapter((EObject) applicationNodes[i]);
- }
-
- }
-
- if (facesConfig.getFactory().size() > 0) {
- FactoryType factory = (FactoryType) facesConfig.getFactory().get(0);
- addOverviewOthersSectionAdapter(factory);
-
- Object[] factoryNodes = contentProvider.getElements(factory);
- for (int i = 0, n = factoryNodes.length; i < n; i++) {
- addOverviewOthersSectionAdapter((EObject) factoryNodes[i]);
- }
-
- }
-
- if (facesConfig.getLifecycle().size() > 0) {
- LifecycleType lifecycle = (LifecycleType) facesConfig
- .getLifecycle().get(0);
- addOverviewOthersSectionAdapter(lifecycle);
-
- Object[] lifecycleNodes = contentProvider.getElements(lifecycle);
- for (int i = 0, n = lifecycleNodes.length; i < n; i++) {
- addOverviewOthersSectionAdapter((EObject) lifecycleNodes[i]);
- }
-
- }
-
- }
-
- protected void addOverviewOthersSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object, OverviewOthersSection.class) == null) {
- object.eAdapters().add(getOverviewOthersSectionAdapter());
- }
-
- }
-
- protected void removeOverviewOthersSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object, OverviewOthersSection.class) != null) {
- object.eAdapters().remove(getOverviewOthersSectionAdapter());
- }
- }
-
- protected OverviewOthersSectionAdapter getOverviewOthersSectionAdapter() {
- if (overviewOthersSectionAdapter == null) {
- overviewOthersSectionAdapter = new OverviewOthersSectionAdapter();
- }
-
- return overviewOthersSectionAdapter;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#removeAdaptersFromInput(java.lang.Object)
- */
- protected void removeAdaptersFromInput(Object oldInput) {
-
- FacesConfigType facesConfig = (FacesConfigType) oldInput;
- removeOverviewOthersSectionAdapter(facesConfig);
- IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
- getAdapterFactory());
- if (facesConfig.getApplication().size() > 0) {
- ApplicationType application = (ApplicationType) facesConfig
- .getApplication().get(0);
- removeOverviewOthersSectionAdapter(application);
-
- Object[] applicationNodes = contentProvider
- .getElements(application);
- for (int i = 0, n = applicationNodes.length; i < n; i++) {
- removeOverviewOthersSectionAdapter((EObject) applicationNodes[i]);
- }
-
- }
-
- if (facesConfig.getFactory().size() > 0) {
- FactoryType factory = (FactoryType) facesConfig.getFactory().get(0);
- removeOverviewOthersSectionAdapter(factory);
-
- Object[] factoryNodes = contentProvider.getElements(factory);
- for (int i = 0, n = factoryNodes.length; i < n; i++) {
- removeOverviewOthersSectionAdapter((EObject) factoryNodes[i]);
- }
-
- }
-
- if (facesConfig.getLifecycle().size() > 0) {
- LifecycleType lifecycle = (LifecycleType) facesConfig
- .getLifecycle().get(0);
- removeOverviewOthersSectionAdapter(lifecycle);
-
- Object[] lifecycleNodes = contentProvider.getElements(lifecycle);
- for (int i = 0, n = lifecycleNodes.length; i < n; i++) {
- removeOverviewOthersSectionAdapter((EObject) lifecycleNodes[i]);
- }
-
- }
-
- }
-
- class OverviewOthersSectionAdapter extends AdapterImpl {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- if (type == OverviewOthersSection.class)
- return true;
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification msg) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Application()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Factory()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Lifecycle()
- || msg.getNotifier() instanceof ApplicationType
- || msg.getNotifier() instanceof FactoryType
- || msg.getNotifier() instanceof LifecycleType) {
-
- if (msg.getEventType() == Notification.ADD) {
- EObject newObject = (EObject) msg.getNewValue();
- if (newObject != null) {
- addOverviewOthersSectionAdapter(newObject);
- }
- }
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- refreshAll();
- }
- }
-
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
deleted file mode 100644
index 211731657..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.DefaultValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.SuggestedValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditPropertyDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class PropertySection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public PropertySection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.PropertySection_Name);
- this.getSection().setDescription(
- EditorMessages.PropertySection_Description);
-
- }
-
- /**
- * @param container
- * @param toolkit
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite propertySection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.verticalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.marginHeight = 0;
- gl2.numColumns = 2;
- propertySection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- propertySection.setLayoutData(gd);
-
- createTableSection(propertySection, toolkit);
- createButtonsSection(propertySection, toolkit);
-
- }
-
- /**
- * create table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn nameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- nameCol.setText(EditorMessages.PropertySection_Table_NameColumn);//$NON-NLS-1$
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol
- .setText(EditorMessages.PropertySection_Table_ClassColumn);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.PropertySection_Table_DefaultValueColumn);
-
- TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- suggestedValueCol
- .setText(EditorMessages.PropertySection_Table_SuggestedValueColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getPropertyType()
- .isInstance(element);
- }
- });
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create property's editing buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
-
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- }
-
- /**
- * refresh the table viewer and update buttons.
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * add a property.
- *
- */
- private void addButtonSelected() {
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditPropertyDialog dialog = new AddEditPropertyDialog(shell, true);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (dialog.open() == Dialog.OK) {
-
- PropertyType newProperty = FacesConfigFactory.eINSTANCE
- .createPropertyType();
-
- if (dialog.getPropertyName().length() > 0) {
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(dialog.getPropertyName());
- newProperty.setPropertyName(propertyNameType);
- }
-
- if (dialog.getPropertyClass().length() > 0) {
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(dialog.getPropertyClass());
- newProperty.setPropertyClass(propertyClassType);
- }
-
- if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- newProperty.setDefaultValue(defaultValueType);
- }
-
- if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- newProperty.setSuggestedValue(suggestedValueType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), null, newProperty);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit a property.
- *
- */
- private void editButtonSelected() {
-
- PropertyType property = (PropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(property);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditPropertyDialog dialog = new AddEditPropertyDialog(shell, false);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (property.getPropertyName() != null) {
- dialog.setPropertyName(property.getPropertyName().getTextContent());
- }
-
- if (property.getPropertyClass() != null) {
- dialog.setPropertyClass(property.getPropertyClass()
- .getTextContent());
- }
-
- if (property.getDefaultValue() != null) {
- dialog.setDefaultValue(property.getDefaultValue().getTextContent());
- }
-
- if (property.getSuggestedValue() != null) {
- dialog.setSuggestedValue(property.getSuggestedValue()
- .getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(4);
-
- if (property.getPropertyName() != null) {
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- property.getPropertyName(),
- FacesConfigPackage.eINSTANCE
- .getPropertyNameType_TextContent(), dialog
- .getPropertyName());
- commands.add(cmd1);
- } else if (dialog.getPropertyName().length() > 0) {
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(dialog.getPropertyName());
-
- Command cmd2 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_PropertyName(),
- propertyNameType);
- commands.add(cmd2);
- }
-
- if (property.getPropertyClass() != null) {
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- property.getPropertyClass(),
- FacesConfigPackage.eINSTANCE
- .getPropertyClassType_TextContent(), dialog
- .getPropertyClass());
- commands.add(cmd3);
- } else if (dialog.getPropertyClass().length() > 0) {
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(dialog.getPropertyClass());
-
- Command cmd4 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_PropertyClass(),
- propertyClassType);
- commands.add(cmd4);
- }
-
- if (property.getDefaultValue() != null) {
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- property.getDefaultValue(),
- FacesConfigPackage.eINSTANCE
- .getDefaultValueType_TextContent(), dialog
- .getDefaultValue());
- commands.add(cmd5);
-
- } else if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- Command cmd6 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_DefaultValue(),
- defaultValueType);
- commands.add(cmd6);
- }
-
- if (property.getSuggestedValue() != null) {
- Command cmd7 = SetCommand.create(this.getEditingDomain(),
- property.getSuggestedValue(),
- FacesConfigPackage.eINSTANCE
- .getSuggestedValueType_TextContent(), dialog
- .getSuggestedValue());
- commands.add(cmd7);
- } else if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- Command cmd8 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_SuggestedValue(),
- suggestedValueType);
- commands.add(cmd8);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(property);
-
- }
- }
-
- }
-
- /**
- * remove a property.
- *
- */
- private void removeButtonSelected() {
- PropertyType property = (PropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(property);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), null, property);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
deleted file mode 100644
index 16a114807..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentFamilyType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererTypeType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditRendererDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RendererSection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public RendererSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.RendererSection_Name);
- this.getSection().setDescription(
- EditorMessages.RendererSection_Description);
-
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite RendererSection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.verticalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.marginHeight = 0;
- gl2.numColumns = 2;
- RendererSection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- RendererSection.setLayoutData(gd);
-
- createTableSection(RendererSection, toolkit);
- createButtonsSection(RendererSection, toolkit);
-
- }
-
- /**
- * create table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn nameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- nameCol.setText(EditorMessages.RendererSection_Table_NameColumn);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.RendererSection_Table_ComponentFamilyColumn);
-
- TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- suggestedValueCol
- .setText(EditorMessages.RendererSection_Table_TypeColumn);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol.setText(EditorMessages.RendererSection_Table_ClassColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getRendererType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, //$NON-NLS-1$
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
-
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- }
-
- /**
- *
- * @return
- */
- private EReference getEReference() {
- EReference reference = null;
- if (getInput() instanceof RenderKitType) {
- reference = FacesConfigPackage.eINSTANCE
- .getRenderKitType_Renderer();
- }
- return reference;
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- /**
- * add an Renderer.
- *
- */
- private void addButtonSelected() {
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditRendererDialog dialog = new AddEditRendererDialog(shell, this
- .getPage(), true);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (dialog.open() == Dialog.OK) {
-
- // RendererType newRenderer = dialog.getResult();
- RendererType newRenderer = FacesConfigFactory.eINSTANCE
- .createRendererType();
-
- if (dialog.getRendererName().length() > 0) {
- DisplayNameType diaplayName = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- diaplayName.setTextContent(dialog.getRendererName());
- newRenderer.getDisplayName().add(diaplayName);
- }
-
- if (dialog.getRendererClass().length() > 0) {
- RendererClassType RendererClassType = FacesConfigFactory.eINSTANCE
- .createRendererClassType();
- RendererClassType.setTextContent(dialog.getRendererClass());
- newRenderer.setRendererClass(RendererClassType);
- }
-
- if (dialog.getComponentFamily().length() > 0) {
- ComponentFamilyType componentFamilyType = FacesConfigFactory.eINSTANCE
- .createComponentFamilyType();
- componentFamilyType.setTextContent(dialog.getComponentFamily());
- newRenderer.setComponentFamily(componentFamilyType);
- }
-
- if (dialog.getRendererType().length() > 0) {
- RendererTypeType rendererType = FacesConfigFactory.eINSTANCE
- .createRendererTypeType();
- rendererType.setTextContent(dialog.getRendererType());
- newRenderer.setRendererType(rendererType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), getEReference(), newRenderer);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit an Renderer.
- *
- */
- private void editButtonSelected() {
-
- RendererType renderer = (RendererType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(renderer);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditRendererDialog dialog = new AddEditRendererDialog(shell, this
- .getPage(), false);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (renderer.getDisplayName() != null
- && renderer.getDisplayName().size() > 0) {
- String name = ((DisplayNameType) (renderer.getDisplayName().get(0)))
- .getTextContent();
- if (name == null) {
- name = "";
- }
- dialog.setRendererName(name);
- }
-
- if (renderer.getRendererClass() != null) {
- dialog.setRendererClass(renderer.getRendererClass()
- .getTextContent());
- }
-
- if (renderer.getComponentFamily() != null) {
- dialog.setComponentFamily(renderer.getComponentFamily()
- .getTextContent());
- }
-
- if (renderer.getRendererType() != null) {
- dialog.setRendererType(renderer.getRendererType().getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(4);
-
- if (renderer.getDisplayName() != null
- && renderer.getDisplayName().size() > 0) {
- DisplayNameType diaplayName = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- diaplayName.setTextContent(dialog.getRendererName());
-
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- renderer.getDisplayName().get(0),
- FacesConfigPackage.eINSTANCE
- .getRendererType_DisplayName(), diaplayName);
- commands.add(cmd1);
- } else if (dialog.getRendererName().length() > 0) {
- DisplayNameType displayName = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayName.setTextContent(dialog.getRendererName());
-
- EList dl = renderer.getDisplayName();
- dl.add(displayName);
- Command cmd2 = AddCommand.create(this.getEditingDomain(),
- renderer.getDisplayName(), FacesConfigPackage.eINSTANCE
- .getRendererType_DisplayName(), dl);
- commands.add(cmd2);
- }
-
- if (renderer.getRendererClass() != null) {
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- renderer.getRendererClass(),
- FacesConfigPackage.eINSTANCE
- .getRendererClassType_TextContent(), dialog
- .getRendererClass());
- commands.add(cmd3);
- } else if (dialog.getRendererClass().length() > 0) {
- RendererClassType RendererClassType = FacesConfigFactory.eINSTANCE
- .createRendererClassType();
- RendererClassType.setTextContent(dialog.getRendererClass());
-
- Command cmd4 = AddCommand.create(this.getEditingDomain(),
- renderer, FacesConfigPackage.eINSTANCE
- .getRendererType_RendererClass(),
- RendererClassType);
- commands.add(cmd4);
- }
-
- if (renderer.getComponentFamily() != null) {
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- renderer.getComponentFamily(),
- FacesConfigPackage.eINSTANCE
- .getDefaultValueType_TextContent(), dialog
- .getComponentFamily());
- commands.add(cmd5);
-
- } else if (dialog.getComponentFamily().length() > 0) {
- ComponentFamilyType componentFamily = FacesConfigFactory.eINSTANCE
- .createComponentFamilyType();
- componentFamily.setTextContent(dialog.getComponentFamily());
- Command cmd6 = AddCommand.create(this.getEditingDomain(),
- renderer, FacesConfigPackage.eINSTANCE
- .getRendererType_ComponentFamily(),
- componentFamily);
- commands.add(cmd6);
- }
-
- if (renderer.getRendererType() != null) {
- Command cmd7 = SetCommand.create(this.getEditingDomain(),
- renderer.getRendererType(),
- FacesConfigPackage.eINSTANCE
- .getSuggestedValueType_TextContent(), dialog
- .getRendererType());
- commands.add(cmd7);
- } else if (dialog.getRendererType().length() > 0) {
- RendererTypeType rendererType = FacesConfigFactory.eINSTANCE
- .createRendererTypeType();
- rendererType.setTextContent(dialog.getRendererType());
- Command cmd8 = AddCommand.create(this.getEditingDomain(),
- renderer, FacesConfigPackage.eINSTANCE
- .getRendererType_RendererType(), rendererType);
- commands.add(cmd8);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(renderer);
-
- }
- }
-
- }
-
- /**
- * remove an Renderer.
- *
- */
- private void removeButtonSelected() {
- RendererType Renderer = (RendererType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(Renderer);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), getEReference(), Renderer);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
deleted file mode 100644
index ad090874a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RenderkitGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField renderkitIdField;
-
- private ClassButtonDialogField renderkitClassField;
-
- private RenderKitGeneralAdapter renderKitGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public RenderkitGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.RenderKitGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.RenderKitGeneralSection_Description);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- RenderKitType Renderkit = (RenderKitType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) Renderkit
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
- displayNameType.eAdapters().add(
- getRenderKitGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, Renderkit,
- FacesConfigPackage.eINSTANCE
- .getRenderKitType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- RenderKitType Renderkit = (RenderKitType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) Renderkit
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
- description.eAdapters().add(
- getRenderKitGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, Renderkit,
- FacesConfigPackage.eINSTANCE
- .getRenderKitType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- renderkitIdField = new StringDialogField();
- // renderkitIdField.setRequired(true);
- renderkitIdField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitID);
- renderkitIdField.doFillIntoGrid(toolkit, container, numberOfColumns);
- renderkitIdField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- RenderKitIdType RenderkitId = FacesConfigFactory.eINSTANCE
- .createRenderKitIdType();
- RenderkitId.setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitId(),
- RenderkitId);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
- }
- });
-
- renderkitClassField = new ClassButtonDialogField(null);
- // renderkitClassField.setRequired(true);
- renderkitClassField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitClass);
- renderkitClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- renderkitClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- LayoutUtil.setHorizontalGrabbing(renderkitClassField.getTextControl(
- toolkit, container));
-
- renderkitClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- RenderKitClassType RenderkitClass = FacesConfigFactory.eINSTANCE
- .createRenderKitClassType();
- RenderkitClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitClass(),
- RenderkitClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- renderkitClassField
- .setSuperClassName(IFacesConfigConstants.RENDER_KIT_SUPER_CLASS);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof RenderKitType) {
- RenderKitType Renderkit = (RenderKitType) input;
-
- if (Renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) Renderkit
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate("");
- }
-
- if (Renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) Renderkit
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil
- .unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate("");
- }
-
- if (Renderkit.getRenderKitId() != null) {
- renderkitIdField.setTextWithoutUpdate(Renderkit
- .getRenderKitId().getTextContent());
- } else {
- renderkitIdField.setTextWithoutUpdate("");
- }
-
- if (Renderkit.getRenderKitClass() != null) {
- renderkitClassField.setTextWithoutUpdate(Renderkit
- .getRenderKitClass().getTextContent());
- } else {
- renderkitClassField.setTextWithoutUpdate("");
- }
- }
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * Add RenderKitGeneralAdapter onto <render-kit> and the first
- * <display-name> and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- RenderKitType renderkit = (RenderKitType) newInput;
- if (EcoreUtil.getExistingAdapter(renderkit,
- RenderkitGeneralSection.class) == null) {
-
- renderkit.eAdapters().add(getRenderKitGeneralAdapter());
- }
-
- if (renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) renderkit
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- RenderkitGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getRenderKitGeneralAdapter());
- }
- }
-
- if (renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) renderkit
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- RenderkitGeneralSection.class) == null) {
-
- description.eAdapters().add(getRenderKitGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove RenderKitGeneralAdapter from <render-kit> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- RenderKitType renderkit = (RenderKitType) oldInput;
- if (EcoreUtil.getExistingAdapter(renderkit,
- RenderkitGeneralSection.class) != null) {
- renderkit.eAdapters().remove(getRenderKitGeneralAdapter());
- }
- if (renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) renderkit
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- RenderkitGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getRenderKitGeneralAdapter());
- }
- }
-
- if (renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) renderkit
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- RenderkitGeneralSection.class) != null) {
-
- description.eAdapters().remove(getRenderKitGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getRenderKitGeneralAdapter() {
-
- if (renderKitGeneralAdapter == null) {
- renderKitGeneralAdapter = new RenderKitGeneralAdapter();
- }
- return renderKitGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <render-kit> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class RenderKitGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == RenderkitGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitId()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_Description()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_DisplayName()) {
- refresh();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refresh();
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
deleted file mode 100644
index 7da706b10..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RenderkitMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- * @param helpContextId
- * @param helpTooltip
- */
- public RenderkitMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.RenderKitMasterSection_Name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.RenderKitMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * RenderKitType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new render kit.
- */
- protected void addButtonSelected(SelectionEvent e) {
- RenderKitType Renderkit = FacesConfigFactory.eINSTANCE
- .createRenderKitType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_RenderKit(), Renderkit);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(Renderkit);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
deleted file mode 100644
index e32601453..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ValidatorGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField validatorIDField;
-
- private ClassButtonDialogField validatorClassField;
-
- private ValidatorGeneralAdapter validatorGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ValidatorGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.ValidatorGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ValidatorGeneralSection_Description);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- ValidatorType validator = (ValidatorType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
- displayNameType.eAdapters().add(
- getValidatorGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, validator,
- FacesConfigPackage.eINSTANCE
- .getValidatorType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- ValidatorType validator = (ValidatorType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
- description.eAdapters().add(
- getValidatorGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, validator,
- FacesConfigPackage.eINSTANCE
- .getValidatorType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- validatorIDField = new StringDialogField();
- // validatorIDField.setRequired(true);
- validatorIDField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorID);
- validatorIDField.doFillIntoGrid(toolkit, container, numberOfColumns);
- validatorIDField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- ValidatorIdType ValidatorType = FacesConfigFactory.eINSTANCE
- .createValidatorIdType();
- ValidatorType
- .setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorId(),
- ValidatorType);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
- }
- });
-
- validatorClassField = new ClassButtonDialogField(null);
- // validatorClassField.setRequired(true);
- validatorClassField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorClass);
- validatorClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- validatorClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(validatorClassField.getTextControl(
- toolkit, container));
-
- validatorClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ValidatorClassType ValidatorClass = FacesConfigFactory.eINSTANCE
- .createValidatorClassType();
- ValidatorClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorClass(),
- ValidatorClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- validatorClassField
- .setInterface(IFacesConfigConstants.VALIDATOR_INTERFACE);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ValidatorType) {
- ValidatorType validator = (ValidatorType) input;
-
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate("");
- }
-
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil
- .unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate("");
- }
-
- if (validator.getValidatorId() != null) {
- validatorIDField.setTextWithoutUpdate(validator
- .getValidatorId().getTextContent());
- } else {
- validatorIDField.setTextWithoutUpdate("");
- }
-
- if (validator.getValidatorClass() != null) {
- validatorClassField.setTextWithoutUpdate(validator
- .getValidatorClass().getTextContent());
- } else {
- validatorClassField.setTextWithoutUpdate("");
- }
- }
- }
-
- /**
- *
- */
- public void clearAll() {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * Add ValidatorGeneralAdapter onto <validator> and the first <display-name>
- * and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- ValidatorType validator = (ValidatorType) newInput;
- if (EcoreUtil.getExistingAdapter(validator,
- ValidatorGeneralSection.class) == null) {
-
- validator.eAdapters().add(getValidatorGeneralAdapter());
- }
-
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ValidatorGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getValidatorGeneralAdapter());
- }
- }
-
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ValidatorGeneralSection.class) == null) {
-
- description.eAdapters().add(getValidatorGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove ValidatorGeneralAdapter from <validator> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- ValidatorType validator = (ValidatorType) oldInput;
- if (EcoreUtil.getExistingAdapter(validator,
- ValidatorGeneralSection.class) != null) {
- validator.eAdapters().remove(getValidatorGeneralAdapter());
- }
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ValidatorGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getValidatorGeneralAdapter());
- }
- }
-
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ValidatorGeneralSection.class) != null) {
-
- description.eAdapters().remove(getValidatorGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getValidatorGeneralAdapter() {
-
- if (validatorGeneralAdapter == null) {
- validatorGeneralAdapter = new ValidatorGeneralAdapter();
- }
- return validatorGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <validator> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class ValidatorGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ValidatorGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorId()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_Description()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_DisplayName()) {
- refresh();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refresh();
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
deleted file mode 100644
index 135367387..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ValidatorMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- * @param helpContextId
- * @param helpTooltip
- */
- public ValidatorMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ValidatorMasterSection_Name); //$NON-NLS-1$
- getSection().setDescription(
- EditorMessages.ValidatorMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * ValidatorType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new Validator.
- */
- protected void addButtonSelected(SelectionEvent e) {
- ValidatorType Validator = FacesConfigFactory.eINSTANCE
- .createValidatorType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Validator(), Validator);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(Validator);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java
deleted file mode 100644
index b67ec9749..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import org.eclipse.jdt.core.IMethod;
-
-/**
- * This class is used to encapsulate the property following the java bean's
- * spec.
- *
- * @author xgzhang
- * @version
- */
-public class JavaBeanProperty {
- private String name;
-
- private String qualifiedType;
-
- private String signatureType;
-
- private IMethod getterMethod;
-
- private IMethod setterMethod;
-
- /**
- *
- */
- public JavaBeanProperty(String name, String signatureType,
- IMethod getterMethod, IMethod setterMethod) {
- this.name = name;
- this.signatureType = signatureType;
-
- this.getterMethod = getterMethod;
- this.setterMethod = setterMethod;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return Returns the setterMethod.
- */
- public IMethod getSetterMethod() {
- return setterMethod;
- }
-
- /**
- * @return Returns the setterMethod.
- */
- public IMethod getGetterMethod() {
- return getterMethod;
- }
-
- /**
- * @return Returns the type.
- */
- public String getQualifiedType() {
- if (qualifiedType == null) {
- IMethod getterSetterMethod = getterMethod != null ? getterMethod
- : setterMethod;
-
- qualifiedType = JavaClassUtils.getQualifiedTypeNameInTypeHierarchy(
- getterSetterMethod.getDeclaringType(), signatureType);
- }
- return qualifiedType;
- }
-
- /**
- * @return Returns the signatureType.
- */
- public String getSignatureType() {
- return signatureType;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java
deleted file mode 100644
index 9ffd4164d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java
+++ /dev/null
@@ -1,771 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import java.beans.Introspector;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.facesconfig.common.utils.JavaModelUtil;
-
-/**
- * This utility class is used to access java bean class, e.g., get java bean's
- * property
- *
- * @author xgzhang
- * @version
- */
-public final class JavaBeanUtils {
- public static final String JAVA_UTIL_LIST = "java.util.List";
-
- public static final String JAVA_UTIL_MAP = "java.util.Map";
-
- /**
- *
- */
- private JavaBeanUtils() {
- super();
- }
-
- /**
- * get the getter method according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- * @throws JavaModelException
- */
- private static IMethod getPropertyGetterMethod(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod getterMethod = null;
-
- String methodBaseName = null;
- // Uppercase 1st letter
- if (propertyName.length() == 1) {
- methodBaseName = propertyName.substring(0, 1).toUpperCase();
- } else {
- methodBaseName = propertyName.substring(0, 1).toUpperCase()
- + propertyName.substring(1);
- }
-
- String getterMethodName = "get" + methodBaseName;
-
- getterMethod = type.getMethod(getterMethodName, null);
- if (getterMethod == null || !getterMethod.exists()
- || !JavaClassUtils.isPublicMethod(getterMethod)) {
- getterMethodName = "is" + methodBaseName;
- getterMethod = type.getMethod(getterMethodName, null);
-
- if (getterMethod == null || !getterMethod.exists()
- || !JavaClassUtils.isPublicMethod(getterMethod)) {
- getterMethod = null;
- }
- }
- return getterMethod;
- }
-
- /**
- * get the getter method in the type hierarchy according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- * @throws JavaModelException
- */
- private static IMethod getPropertyGetterMethodInTypeHierarchy(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod getterMethod = null;
-
- getterMethod = getPropertyGetterMethod(type, propertyName);
-
- if (getterMethod == null) {
- ITypeHierarchy typeHierarchy = null;
- typeHierarchy = type.newSupertypeHierarchy(null);
-
- if (typeHierarchy == null) {
- return null;
- }
-
- IType[] superTypes = typeHierarchy.getAllSuperclasses(type);
-
- if (superTypes == null || superTypes.length == 0) {
- return null;
- }
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) {
- getterMethod = getPropertyGetterMethod(superTypes[i],
- propertyName);
- if (getterMethod != null) {
- break;
- }
- }
- }
- }
- return getterMethod;
- }
-
- /**
- * get the setter method in the type hierarchy according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- */
- private static IMethod getPropertySetterMethodInTypeHierarchy(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod setterMethod = null;
-
- setterMethod = getPropertySetterMethod(type, propertyName);
-
- if (setterMethod == null) {
- ITypeHierarchy typeHierarchy = null;
- typeHierarchy = type.newSupertypeHierarchy(null);
-
- if (typeHierarchy == null) {
- return null;
- }
-
- IType[] superTypes = typeHierarchy.getAllSuperclasses(type);
-
- if (superTypes == null || superTypes.length == 0) {
- return null;
- }
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) {
- setterMethod = getPropertySetterMethod(superTypes[i],
- propertyName);
- if (setterMethod != null) {
- break;
- }
- }
- }
- }
-
- return setterMethod;
- }
-
- /**
- * get the setter method according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- */
- private static IMethod getPropertySetterMethod(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod setterMethod = null;
-
- String methodBaseName = null;
- // Uppercase 1st letter
- if (propertyName.length() == 1) {
- methodBaseName = propertyName.substring(0, 1).toUpperCase();
- } else {
- methodBaseName = propertyName.substring(0, 1).toUpperCase()
- + propertyName.substring(1);
- }
-
- String setterMethodName = "set" + methodBaseName;
-
- IMethod[] methods = null;
-
- methods = type.getMethods();
-
- if (methods == null || methods.length == 0) {
- return null;
- }
-
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getElementName().equals(setterMethodName)) {
- if (methods[i] == null || !methods[i].exists()
- || !JavaClassUtils.isPublicMethod(methods[i])) {
- continue;
- }
-
- // Method must return void
- String returnType = methods[i].getReturnType();
- if (!returnType.equals(Signature.SIG_VOID)) {
- continue;
- }
-
- String params[] = methods[i].getParameterTypes();
- // method must have only one argument
- if (params.length != 1) {
- continue;
- }
- setterMethod = methods[i];
- }
- }
-
- return setterMethod;
- }
-
- /**
- * Check whether the propertyName is bean's property or not.
- *
- * @param baseType
- * @param propertyName
- *
- * @return - True means the property name is valid bean's property,
- * otherwise, not.
- *
- * @throws JavaModelException
- */
- public static boolean isBeanProperty(IType baseType, String propertyName)
- throws JavaModelException {
- if (baseType == null || !baseType.exists() || propertyName == null) {
- return false;
- }
-
- return (getBeanPropertyType(baseType, propertyName) != null);
- }
-
- /**
- * get the bean's property type
- *
- * @param baseType
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- *
- * @throws JavaModelException
- */
- public static IType getBeanPropertyType(IType baseType, String propertyName) {
- if (baseType == null || !baseType.exists() || propertyName == null) {
- return null;
- }
-
- String typeSignature = null;
- IMethod getterMethod = null;
- IMethod setterMethod = null;
-
- IType declaredType = baseType;
- try {
- getterMethod = getPropertyGetterMethodInTypeHierarchy(baseType,
- propertyName);
- setterMethod = getPropertySetterMethodInTypeHierarchy(baseType,
- propertyName);
- } catch (JavaModelException e1) {
- // Need not any error handling.
- }
-
- if (getterMethod != null && setterMethod == null) {
- declaredType = getterMethod.getDeclaringType();
- try {
- typeSignature = getterMethod.getReturnType();
- } catch (JavaModelException e2) {
- // Need not any error handling.
- }
- } else if (setterMethod != null && getterMethod == null) {
- declaredType = setterMethod.getDeclaringType();
- typeSignature = setterMethod.getParameterTypes()[0];
- } else if (setterMethod != null && getterMethod != null) {
- declaredType = getterMethod.getDeclaringType();
- try {
- // FIXME: should check the type hierachy
- if (getterMethod.getReturnType().equals(
- setterMethod.getParameterTypes()[0])) {
- typeSignature = getterMethod.getReturnType();
- }
- } catch (JavaModelException e2) {
- // Need not any error handling.
- }
- }
-
- if (typeSignature == null) {
- return null;
- }
-
- IType type = null;
-
- try {
- String typeName = JavaModelUtil.getResolvedTypeName(typeSignature,
- declaredType);
- if (typeName != null) {
- type = baseType.getJavaProject().findType(typeName);
- }
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
- return type;
- }
-
- /**
- * get the bean's property's getter and setter methods.
- *
- * @param baseType
- * @param propertyName
- * @return - IMethod[], the first is getter and the second is setter method,
- * however, both of them can be null.
- */
- public static IMethod[] getBeanPropertyMethods(IType baseType,
- String propertyName) {
- if (baseType == null || !baseType.exists() || propertyName == null) {
- return null;
- }
-
- IMethod[] methods = new IMethod[2];
-
- IMethod getterMethod = null;
- IMethod setterMethod = null;
- try {
- getterMethod = getPropertyGetterMethodInTypeHierarchy(baseType,
- propertyName);
-
- setterMethod = getPropertySetterMethodInTypeHierarchy(baseType,
- propertyName);
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
-
- if (getterMethod != null && setterMethod == null) {
- methods[0] = getterMethod;
- } else if (setterMethod != null && getterMethod == null) {
- methods[1] = setterMethod;
- } else if (setterMethod != null && getterMethod != null) {
- try {
- // FIXME: should check the type hierachy
- if (getterMethod.getReturnType().equals(
- setterMethod.getParameterTypes()[0])) {
- methods[0] = getterMethod;
- methods[1] = setterMethod;
- }
- } catch (JavaModelException e1) {
- // Need not any error handling.
- }
- }
-
- return methods;
- }
-
- /**
- * check whether the type implements <code>java.util.List</code>
- *
- * @param type
- * @return - True if the type is the sub class of
- * <code>java.util.List</code>, otherwise, not.
- */
- public static boolean isListType(IType type) {
- if (type == null) {
- return false;
- }
- if (type.getFullyQualifiedName().equalsIgnoreCase(JAVA_UTIL_LIST)) {
- return true;
- }
-
- return JavaClassUtils.isSubClassOf(type.getJavaProject(), type
- .getFullyQualifiedName(), JAVA_UTIL_LIST);
- }
-
- /**
- * check whether the type implements <code>java.util.Map</code>
- *
- * @param type
- * @return - True if the type is the sub class of <code>java.uitl.Map</code>,
- * otherwise, not.
- */
- public static boolean isMapType(IType type) {
- if (type == null) {
- return false;
- }
- if (type.getFullyQualifiedName().equalsIgnoreCase(JAVA_UTIL_MAP)) {
- return true;
- }
-
- return JavaClassUtils.isSubClassOf(type.getJavaProject(), type
- .getFullyQualifiedName(), JAVA_UTIL_MAP);
- }
-
- /**
- * Test for method inclusion in bindings list.
- * <p>
- * This test has the following conditions:
- * </p>
- * <ul>
- * <li>method starts with <code>get</code></li>
- * <li>method has no arguments</li>
- * <li>method does not return void</li>
- * </ul>
- *
- * @param method -
- * the IMethod to examine
- * @return boolean - true, if method satisfies the condition test
- */
- public static boolean isGetterMethod(IMethod method) {
- try {
- if (!JavaClassUtils.isPublicMethod(method)) {
- return false;
- }
- String params[] = method.getParameterTypes();
- // Has no arguments
- if (params.length > 0) {
- return false;
- }
-
- // Starts with "get"
- if (!(method.getElementName().startsWith("get") || method.getElementName().startsWith("is"))) //$NON-NLS-1$
- {
- return false;
- }
- // Does not return void
- String rtn = method.getReturnType();
- if (!rtn.equals(Signature.SIG_VOID)) {
- return true;
- }
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
- return false;
- }
-
- /**
- * Test for method inclusion in bindings list.
- * <p>
- * This test has the following conditions:
- * </p>
- * <ul>
- * <li>method starts with <code>set</code></li>
- * <li>method returns void</li>
- * </ul>
- *
- * @param method -
- * the IMethod to examine
- * @return boolean - true, if method satisfies the condition test
- */
- public static boolean isSetterMethod(IMethod method) {
- try {
- if (!JavaClassUtils.isPublicMethod(method)) {
- return false;
- }
- // Starts with "set"
- if (!method.getElementName().startsWith("set")) //$NON-NLS-1$
- {
- return false;
- }
-
- // the parameter's number should be one.
- if (method.getParameterTypes().length != 1) {
- return false;
- }
- // Returns void
- String rtn = method.getReturnType();
- if (rtn.equals(Signature.SIG_VOID)) {
- return true;
- }
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
- return false;
- }
-
- /**
- * set the first character into low case.
- *
- * @param str
- * @return
- */
- public static String toLowCaseFirstChar(String str) {
- // change the first alphabet to lowcase.
- if (str != null && str.length() > 0) {
- if (str.length() == 1) {
- str = str.toLowerCase();
- } else {
- str = str.substring(0, 1).toLowerCase() + str.substring(1);
- }
- }
- return str;
- }
-
- /**
- * set the first character into low case.
- *
- * @param str
- * @return
- */
- public static String toUpperCaseFirstChar(String str) {
- // change the first alphabet to lowcase.
- if (str != null && str.length() > 0) {
- if (str.length() == 1) {
- str = str.toUpperCase();
- } else {
- str = str.substring(0, 1).toUpperCase() + str.substring(1);
- }
- }
- return str;
- }
-
- /**
- * get property name from getter method.
- *
- * @param method
- * @return - can be <b>null</b>, if the method is not a valid getter method
- */
- public static String getPropertyNameFromGetterMethod(IMethod method) {
- if (!isGetterMethod(method)) {
- return null;
- }
- String methodName = method.getElementName();
- String propertyName = null;
- // Starts with "get"
- if (methodName.startsWith("get") && methodName.length() > 3) {
- propertyName = methodName.substring(3);
- } else if (methodName.startsWith("is") && methodName.length() > 2) // Starts
- // with
- // "is"
- {
- propertyName = methodName.substring(2);
- }
- propertyName = Introspector.decapitalize(propertyName);
- return propertyName;
- }
-
- /**
- * get property name from setter class.
- *
- * @param method
- * @return - can be <b>null</b>, if the method is not a valid setter method
- */
- public static String getPropertyNameFromSetterMethod(IMethod method) {
- if (!isSetterMethod(method)) {
- return null;
- }
- String methodName = method.getElementName();
- String propertyName = null;
- // Starts with "get"
- if (methodName.startsWith("set") && methodName.length() > 3) {
- propertyName = methodName.substring(3);
- }
- propertyName = Introspector.decapitalize(propertyName);
- return propertyName;
- }
-
- /**
- * get the method with the same parameters
- *
- * @param methods
- * @param visitedMethods
- * @param foundMethod
- * @param foundMethodName
- * @param foundParamTypes
- * @return
- */
- private static IMethod getMethodWithSameParamters(IMethod[] methods,
- Map visitedMethods, IMethod foundMethod, String foundMethodName,
- String[] foundParamTypes) {
- // get all qualified type name for the found method's parameters.
- String[] foundParamQulifiedTypeNames = null;
- if (foundParamTypes != null && foundParamTypes.length > 0) {
- foundParamQulifiedTypeNames = new String[foundParamTypes.length];
- for (int i = 0; i < foundParamTypes.length; i++) {
- foundParamQulifiedTypeNames[i] = JavaClassUtils
- .getQualifiedTypeNameInTypeHierarchy(foundMethod
- .getDeclaringType(), foundParamTypes[i]);
- }
- }
- for (int i = 0; i < methods.length; i++) {
- if (visitedMethods.get(methods[i]) != null) {
- continue;
- }
-
- if (!methods[i].getElementName().equals(foundMethodName)) {
- continue;
- }
- if (methods[i].getParameterTypes() == null
- && foundParamTypes == null) {
- return methods[i];
- } else if (methods[i].getParameterTypes() != null
- && foundParamTypes != null
- && foundParamTypes.length == methods[i].getParameterTypes().length) {
- boolean bSameParams = true;
- String[] methodParamTypes = methods[i].getParameterTypes();
- for (int j = 0; j < foundParamQulifiedTypeNames.length; j++) {
- String methodParamQualifiedTypeName = JavaClassUtils
- .getQualifiedTypeNameInTypeHierarchy(methods[i]
- .getDeclaringType(), methodParamTypes[j]);
- // if the qualified type name is not same or not subclass or
- // supper class between each other.
- if (!methodParamQualifiedTypeName
- .equals(foundParamQulifiedTypeNames[j])
- && !JavaClassUtils.isSubClassOf(methods[i]
- .getJavaProject(),
- methodParamQualifiedTypeName,
- foundParamQulifiedTypeNames[j])
- && !JavaClassUtils.isSubClassOf(methods[i]
- .getJavaProject(),
- foundParamQulifiedTypeNames[j],
- methodParamQualifiedTypeName)) {
- bSameParams = false;
- break;
- }
- }
- if (bSameParams) {
- return methods[i];
- }
- }
- }
- return null;
- }
-
- /**
- * Creates an array of bean properties
- *
- *
- * @param classType
- * @return it can be <b>null</b>, if property is not found.
- */
- public static JavaBeanProperty[] getBeanProperties(IType classType) {
- IMethod[] methods;
- try {
- methods = JavaClassUtils.getMethods(classType);
- } catch (JavaModelException e2) {
- return null;
- }
-
- return getBeanProperties(classType, methods);
- }
-
- /**
- * Creates an array of bean properties
- *
- * @param classType
- * @param methods
- *
- * @return - the array of java bean properties.
- */
- public static JavaBeanProperty[] getBeanProperties(IType type,
- IMethod[] methods) {
- if (methods == null || methods.length == 0) {
- return null;
- }
-
- List properties = new ArrayList();
- Map visitedMethods = new HashMap();
- for (int m = 0; m < methods.length; m++) {
- String propertyName = null;
- // if a property's getter method or setter method already visited,
- // just skip it.
- if (visitedMethods.get(methods[m]) != null) {
- continue;
- }
-
- visitedMethods.put(methods[m], methods[m]);
-
- // Check getter firstly
- propertyName = JavaBeanUtils
- .getPropertyNameFromGetterMethod(methods[m]);
-
- if (propertyName != null && propertyName.length() > 0) //$NON-NLS-1$
- {
- String setterMethodName = "set"
- + JavaBeanUtils.toUpperCaseFirstChar(propertyName);
-
- String getterReturnType = null;
- try {
- getterReturnType = methods[m].getReturnType();
- } catch (JavaModelException e1) {
- continue;
- }
- IMethod setterMethod = getMethodWithSameParamters(methods,
- visitedMethods, methods[m], setterMethodName,
- new String[] { getterReturnType });
- if (setterMethod != null && setterMethod.exists()) {
- visitedMethods.put(setterMethod, setterMethod);
- }
-
- properties.add(new JavaBeanProperty(propertyName,
- getterReturnType, methods[m], setterMethod));
- continue;
- }
-
- // Check setter secondly.
- propertyName = JavaBeanUtils
- .getPropertyNameFromSetterMethod(methods[m]);
-
- if (propertyName != null && propertyName.length() > 0) //$NON-NLS-1$
- {
- // first form of getter method, "get..."
- String getterMethodName = "get"
- + JavaBeanUtils.toUpperCaseFirstChar(propertyName);
- IMethod getterMethod = getMethodWithSameParamters(methods,
- visitedMethods, methods[m], getterMethodName, null);
-
- if (getterMethod != null && getterMethod.exists()) {
- try {
- if (getterMethod.getReturnType().equals(
- methods[m].getParameterTypes()[0])) {
- visitedMethods.put(getterMethod, getterMethod);
- }
- } catch (JavaModelException e) {
- // need not error logging
- }
- } else {
- // another form of getter method, "is...".
- getterMethodName = "is"
- + JavaBeanUtils.toUpperCaseFirstChar(propertyName);
- getterMethod = getMethodWithSameParamters(methods,
- visitedMethods, methods[m], getterMethodName, null);
- try {
- if (getterMethod != null
- && getterMethod.exists()
- && getterMethod.getReturnType().equals(
- methods[m].getParameterTypes()[0])) {
- visitedMethods.put(getterMethod, getterMethod);
- }
- } catch (JavaModelException e) {
- // need not error logging
- }
- }
-
- properties.add(new JavaBeanProperty(propertyName, methods[m]
- .getParameterTypes()[0], getterMethod, methods[m]));
- continue;
- }
- }
-
- JavaBeanProperty[] propertyArray = (JavaBeanProperty[]) properties
- .toArray(new JavaBeanProperty[properties.size()]);
-
- Arrays.sort(propertyArray, new Comparator() {
- public int compare(Object o1, Object o2) {
- String name1 = ((JavaBeanProperty) o1).getName();
- String name2 = ((JavaBeanProperty) o2).getName();
- return name1.compareTo(name2);
- }
- });
- return propertyArray;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java
deleted file mode 100644
index 7e39384d2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.jsf.facesconfig.common.IFileFolderConstants;
-import org.eclipse.jst.jsf.facesconfig.common.utils.JavaModelUtil;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This utility class defines typical operations on java class, such as check
- * public constructor, and check type is primitive or not, etc.
- *
- * @author Jane Cantz, Xiao-guang Zhang
- */
-public class JavaClassUtils {
- /**
- * Determines if a string contains any illegal characters
- *
- * @param text -
- * the string to test
- * @return boolean - true if an illegal character is found, otherwise false
- */
- public static boolean hasIllegalCharacters(String text) {
- if (text.length() == 0
- || !Character.isJavaIdentifierStart(text.charAt(0))) {
- return true;
- }
- for (int i = 1; i < text.length(); i++) {
- if (!Character.isJavaIdentifierPart(text.charAt(i))) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Test for constructor.
- * <p>
- * This test determines if the class has any constructors
- * </p>
- *
- * @param methods -
- * the IMethod array to examine
- * @return boolean - true, if method has no constructors
- */
- public static boolean hasNoConstructor(IMethod[] methods) {
- for (int m = 0; m < methods.length; m++) {
- try {
- if (methods[m].isConstructor()) {
- return false;
- }
- } catch (JavaModelException e) {
- }
- }
- return true;
- }
-
- /**
- * check whether the method is public or not.
- *
- * @param method
- * @return
- */
- public static boolean isPublicMethod(IMethod method) {
- int accessFlags = 0;
-
- try {
- accessFlags = method.getFlags();
- } catch (JavaModelException e) {
- return false;
- }
-
- boolean isPublic = Flags.isPublic(accessFlags);
- if ((!Flags.isPrivate(accessFlags))
- && (!Flags.isProtected(accessFlags))
- && (!Flags.isPublic(accessFlags))) {
- // No specific modifier was set, so assume to be public
- isPublic = true;
- }
- if (!isPublic) {
- return false;
- }
- return true;
- }
-
- /**
- * Test for constructor.
- * <p>
- * This test has the following conditions:
- * </p>
- * <ul>
- * <li>method takes 0 arguments and the method name is the class name:
- * <ul>
- * <li>takes 0 arguments</li>
- * <li>the method name is the class name</li>
- * <li>the method returns void</code></li>
- * </ul>
- * </li>
- * </ul>
- *
- * @param methods -
- * the IMethod array to examine
- * @return boolean - true, if method is a constructor
- * @throws JavaModelException
- */
- public static boolean hasPublicConstructor(IMethod[] methods) {
- for (int m = 0; m < methods.length; m++) {
- try {
- if (methods[m].isConstructor() && isPublicMethod(methods[m])) {
- // Constructor must have the following 0 arguments
- String[] params = methods[m].getParameterTypes();
- if (params.length == 0) {
- // And must return a void
- String rtn = methods[m].getReturnType();
- if (rtn.equals(Signature.SIG_VOID)) {
- return true;
- }
- break;
- }
- }
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- ;
-
- }
- return false;
- }
-
- /**
- * Determines if a datatype is primitive type or part of java.lang or
- * java.util package. If not, it is considered to be a bean reference
- *
- * @param jProject -
- * the Java Project
- * @param cUnit -
- * the parent class compilation unit
- * @param signatureName -
- * the datatype of the property
- * @return boolean - true, if the datatype is primitive or part of java.lang
- * or java.util package
- * @throws JavaModelException
- */
- public static boolean isPrimitiveType(IType classType, String signatureName)
- throws JavaModelException {
- while (signatureName.startsWith("[")) {
- signatureName = signatureName.substring(1);
- }
- int kind = Signature.getTypeSignatureKind(signatureName);
- if (kind == Signature.BASE_TYPE_SIGNATURE
- || signatureName.equals(Signature.SIG_VOID)) {
- // These are true primitive types
- return true;
- }
-
- String qualifiedName = getQualifiedTypeNameInTypeHierarchy(classType,
- signatureName);
-
- if ((qualifiedName.startsWith("java.lang")) || (qualifiedName.startsWith("java.util"))) //$NON-NLS-1$
- {
- return true;
- }
- return false;
- }
-
- /**
- * get the type from the input class name
- *
- * @param project
- * @param text
- * @return - can be null.
- */
- public static IType getType(IProject project, String className) {
- if (project == null) {
- return null;
- }
- IType cunit = null;
- if (className.length() > 0) {
-
- IJavaProject jProject = JavaCore.create(project);
- try {
- cunit = jProject.findType(className);
- } catch (JavaModelException e) {
- }
- }
- return cunit;
- }
-
- /**
- * open the type in the editor.
- *
- * @param type
- */
- public static boolean openType(IType type) {
- if (type == null || !type.exists()) {
- return false;
- }
-
- try {
- IEditorPart editorPart = JavaUI.openInEditor(type
- .getPrimaryElement());
- if (editorPart != null) {
- JavaUI.revealInEditor(editorPart, type.getPrimaryElement());
- return true;
- }
- } catch (PartInitException e) {
- // ignore this error.
- } catch (JavaModelException e) {
- // ignore this error.
- }
- return false;
- }
-
- /**
- * get package name from java source file
- *
- * @param javaFile
- * @return - can be null.
- */
- public static String getPackageName(IFile javaFile) {
- if (javaFile == null) {
- return null;
- }
- String ext = "." + javaFile.getFileExtension(); //$NON-NLS-1$
- // See if the file is a java file
- if (!ext.equalsIgnoreCase(IFileFolderConstants.EXT_JAVA)) {
- return null;
- }
- String packagename = new String();
- ICompilationUnit cunit = JavaCore.createCompilationUnitFrom(javaFile);
- try {
- IPackageDeclaration[] packages = cunit.getPackageDeclarations();
- if (packages.length == 0) {
- packagename = new String();
- } else {
- packagename = packages[0].getElementName();
- }
- } catch (JavaModelException jme) {
- }
- return packagename;
- }
-
- /**
- * copy the array to the list.
- *
- * @param methodList
- * @param methods
- * @throws JavaModelException
- */
- private static void copyToMethodList(List methodList, IMethod[] methods)
- throws JavaModelException {
- if (methods != null && methods.length > 0) {
- for (int i = 0; i < methods.length; i++) {
- if (!isDuplicateMethod(methodList, methods[i])) {
- methodList.add(methods[i]);
- }
- }
- }
- }
-
- /**
- * check whether this method is duplicated or not in the existing method
- * list.
- *
- * @param methodList
- * @param method
- * @return
- * @throws JavaModelException
- */
- private static boolean isDuplicateMethod(List methodList, IMethod method)
- throws JavaModelException {
- if (method == null || !method.exists()) {
- return false;
- }
-
- String[] paramTypes = method.getParameterTypes();
- String methodName = method.getElementName();
-
- for (Iterator iter = methodList.iterator(); iter.hasNext();) {
- IMethod existedMethod = (IMethod) iter.next();
- if (isSameMethodSignature(methodName, paramTypes, existedMethod)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Tests if a method equals to the given signature. Parameter types are only
- * compared by the simple name, no resolving for the fully qualified type
- * name is done. Constructors are only compared by parameters, not the name.
- *
- * @param name
- * Name of the method
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @return Returns <code>true</code> if the method has the given name and
- * parameter types and constructor state.
- */
- public static boolean isSameMethodSignature(String name,
- String[] paramTypes, IMethod curr) throws JavaModelException {
- if (name.equals(curr.getElementName())) {
- String[] currParamTypes = curr.getParameterTypes();
- if (paramTypes.length == currParamTypes.length) {
- for (int i = 0; i < paramTypes.length; i++) {
- String t1 = Signature.getSimpleName(Signature
- .toString(paramTypes[i]));
- String t2 = Signature.getSimpleName(Signature
- .toString(currParamTypes[i]));
- if (!t1.equals(t2)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- /**
- * get methods for the class Type including its super class
- *
- * @param jProject
- * @param classType
- * @return - can be null
- * @throws JavaModelException
- */
- public static IMethod[] getMethods(IType classType)
- throws JavaModelException {
- if (classType == null) {
- return null;
- }
- List methodList = new ArrayList();
- IMethod[] methods = classType.getMethods();
- copyToMethodList(methodList, methods);
-
- ITypeHierarchy typeHierarchy = classType.newSupertypeHierarchy(null);
-
- if (typeHierarchy != null) {
- IType[] superTypes = typeHierarchy.getAllSuperclasses(classType);
-
- if (superTypes != null && superTypes.length > 0) {
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) {
- methods = superTypes[i].getMethods();
-
- copyToMethodList(methodList, methods);
- }
- }
- }
- }
-
- if (methodList != null && methodList.size() > 0) {
- IMethod[] validMethods = (IMethod[]) methodList
- .toArray(new IMethod[methodList.size()]);
-
- Arrays.sort(validMethods, new Comparator() {
- public int compare(Object o1, Object o2) {
- String name1 = ((IMethod) o1).getElementName();
- String name2 = ((IMethod) o2).getElementName();
- return name1.compareTo(name2);
- }
- });
- return validMethods;
- }
- return null;
- }
-
- /**
- * resolve and get the qualified name for the incomplete typename
- *
- * @param classType
- * @param typeName
- * @return - at least equal to Signature.toString(signatureName).
- */
- public static String getQualifiedTypeNameInTypeHierarchy(IType classType,
- String signatureName) {
- int arrayNum = 0;
- while (signatureName.startsWith("[")) {
- arrayNum++;
- signatureName = signatureName.substring(1);
- }
-
- String qualifiedTypeName = Signature.toString(signatureName);
- int kind = Signature.getTypeSignatureKind(signatureName);
- if (kind == Signature.BASE_TYPE_SIGNATURE
- || signatureName.equals(Signature.SIG_VOID)) {
- // Add back array identifiers
- while (arrayNum > 0) {
- qualifiedTypeName = qualifiedTypeName + "[]";
- arrayNum--;
- }
- return qualifiedTypeName;
- }
-
- String typeName = Signature.toString(signatureName);
-
- String foundName = getQualifiedTypeName(classType, typeName);
- // if found in current type
- if (foundName != null) {
- qualifiedTypeName = foundName;
- } else // else found in the type hierachy.
- {
- ITypeHierarchy typeHierarchy = null;
- try {
- typeHierarchy = classType.newSupertypeHierarchy(null);
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- if (typeHierarchy != null) {
- IType[] superTypes = typeHierarchy.getAllSupertypes(classType);
-
- if (superTypes != null && superTypes.length > 0) {
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) {
- foundName = getQualifiedTypeName(superTypes[i],
- typeName);
- if (foundName != null) {
- qualifiedTypeName = foundName;
- break;
- }
- }
- }
- }
- }
- }
-
- // Add back array identifiers
- while (arrayNum > 0) {
- qualifiedTypeName = qualifiedTypeName + "[]";
- arrayNum--;
- }
- return qualifiedTypeName;
- }
-
- /**
- * resolve and get the qualified name for the incomplete typename
- *
- * @param classType
- * @param typeName
- * @return can be null.
- */
- public static String getQualifiedTypeName(IType classType, String typeName) {
- String qualifiedTypeName = null;
-
- try {
- String[][] resolvedNames = classType.resolveType(typeName);
- if (resolvedNames != null && resolvedNames.length > 0) {
- qualifiedTypeName = JavaModelUtil.concatenateName(
- resolvedNames[0][0], resolvedNames[0][1]);
- }
- } catch (JavaModelException e1) {
- // Nothing to do.
- }
-
- return qualifiedTypeName;
- }
-
- /**
- * check whether subclass is sub class of supperclass
- *
- * @param jProject
- * @param subClass -
- * fully qualified name of sub class
- * @param superClass -
- * fully qualified name of super class
- *
- * @return
- */
- public static boolean isSubClassOf(IJavaProject jProject, String subClass,
- String superClass) {
- if (jProject == null || subClass == null || superClass == null) {
- return false;
- }
-
- try {
- IType subClassType = jProject.findType(subClass);
-
- if (subClassType != null) {
- ITypeHierarchy typeHierarchy = null;
- try {
- typeHierarchy = subClassType.newSupertypeHierarchy(null);
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- IType[] superTypes = typeHierarchy
- .getAllSupertypes(subClassType);
-
- if (superTypes != null && superTypes.length > 0) {
- for (int i = 0; i < superTypes.length; i++) {
- if (superTypes[i].getFullyQualifiedName().equals(
- superClass)) {
- return true;
- }
- }
- }
- }
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java
deleted file mode 100644
index 0670aa628..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanUtil {
-
- /**
- * Determines if the new bean to be added is already a member of the
- * configuration set.
- *
- * @param beanName -
- * The name of the bean being added
- * @return int - 0 if bean doesn't exist, otherwise the choice from the
- * Duplicate Bean dialog
- */
- public static boolean isBeanDuplicate(IProject project, String beanName) {
- // TODO we may need to consider the managed bean declared in other
- // faces config file in the project, not only the default faces config
- // file.
- FacesConfigArtifactEdit artifactEdit = FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForRead(project);
- if (artifactEdit != null) {
- FacesConfigType facesConfig = artifactEdit.getFacesConfig();
- List beans = facesConfig.getManagedBean();
-
- // Iterate through the bean list
- for (Iterator i = beans.iterator(); i.hasNext();) {
- Object o = i.next();
- if (o instanceof ManagedBeanType) {
- ManagedBeanType mbti = (ManagedBeanType) o;
- if (mbti.getManagedBeanName() != null) {
- String name = mbti.getManagedBeanName()
- .getTextContent();
- if (name != null && name.equals(beanName)) {
- return true;
- }
- }
- }
- }
-
- }
- return false;
- }
-
- /**
- * get the default managed bean name in the current project according to
- * reference name
- *
- * @param project -
- * current project
- * @param refName -
- * seed reference name
- * @return String - default managed bean name
- */
- public static String getDefaultManagedBeanName(IProject project,
- String refName) {
- String defaultName = refName;
-
- int newRefNameIndex = 1;
- while (isBeanDuplicate(project, defaultName)) {
- defaultName = refName + newRefNameIndex;
- newRefNameIndex++;
- }
- return defaultName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
deleted file mode 100644
index 09ff8683b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class ModelUtil {
-
- /**
- * Get the super class's name of certain element. For example, a class for
- * <action-listener> should implement interface
- * "javax.faces.event.ActionListener".
- *
- *
- *
- * @param key
- * the EClass object of the application child.
- * @return
- */
- public static String getSuperType(Object key) {
- if (key == FacesConfigPackage.eINSTANCE.getActionListenerType()) {
- return IFacesConfigConstants.ACTION_LISTENER_INTERFACE;
- }
- if (key == FacesConfigPackage.eINSTANCE.getNavigationHandlerType()) {
- return IFacesConfigConstants.NAVIGATION_HANDLE_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getPropertyResolverType()) {
- return IFacesConfigConstants.PROPERTY_RESOLVER_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getStateManagerType()) {
- return IFacesConfigConstants.STATE_MANAGER_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getVariableResolverType()) {
- return IFacesConfigConstants.VARIABLE_RESOLVER_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getViewHandlerType()) {
- return IFacesConfigConstants.VIEW_HANDLER_SUPER_CLASS;
- }
-
- if (key == FacesConfigPackage.eINSTANCE.getApplicationFactoryType()) {
- return IFacesConfigConstants.APPLICATION_FACTORY_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getFacesContextFactoryType()) {
- return IFacesConfigConstants.FACES_CONTEXT_FACTORY_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getLifecycleFactoryType()) {
- return IFacesConfigConstants.LIFECYCLE_FACTORY_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getRenderKitFactoryType()) {
- return IFacesConfigConstants.RENDER_KIT_FACTORY_SUPER_CLASS;
- }
-
- if (key == FacesConfigPackage.eINSTANCE.getPhaseListenerType()) {
- return IFacesConfigConstants.PHASE_LISTENER_INTERFACE;
- }
-
- return null;
- }
-
-
- /**
- * This will take the three pre-defined entities in XML 1.0 (used
- * specifically in XML elements) and convert their character representation
- * to the appropriate entity reference, suitable for XML element content.
- *
- * @param str
- * <code>String</code> input to escape.
- * @return <code>String</code> with escaped content.
- */
- public static String escapeEntities(String str) {
- if (isEmptyString(str)) {
- return "";
- }
-
- StringBuffer buffer;
- char ch;
- String entity;
-
- buffer = null;
- for (int i = 0, n = str.length(); i < n; i++) {
- ch = str.charAt(i);
- switch (ch) {
- case '<':
- entity = "&lt;";
- break;
- case '>':
- entity = "&gt;";
- break;
- case '\'':
- entity = "&apos;";
- break;
- case '\"':
- entity = "&quot;";
- break;
- case '&':
- entity = "&amp;";
- break;
- case '\r':
- entity = "&#xD;";
- break;
- case '\t':
- entity = "&#x9;";
- break;
- case '\n':
- entity = "&#xA;";
- break;
- default:
- entity = null;
- break;
- }
- if (buffer == null) {
- if (entity != null) {
- // An entity occurred, so we'll have to use StringBuffer
- // (allocate room for it plus a few more entities).
- buffer = new StringBuffer(str.length() + 20);
- // Copy previous skipped characters and fall through
- // to pickup current character
- buffer.append(str.substring(0, i));
- buffer.append(entity);
- }
- } else {
- if (entity == null) {
- buffer.append(ch);
- } else {
- buffer.append(entity);
- }
- }
- }
-
- // If there were any entities, return the escaped characters
- // that we put in the StringBuffer. Otherwise, just return
- // the unmodified input string.
- return (buffer == null) ? str : buffer.toString();
- }
-
- public static String unEscapeEntities(String str) {
- if (isEmptyString(str)) {
- return "";
- }
-
- String result = new String(str);
-
- result = result.replaceAll("&amp;", "&");
- result = result.replaceAll("&lt;", "<");
- result = result.replaceAll("&gt;", ">");
- result = result.replaceAll("&apos;", "\'");
- result = result.replaceAll("&quot;", "\"");
- result = result.replaceAll("&#xD;", "\r");
- result = result.replaceAll("&#x9;", "\t");
- result = result.replaceAll("&#xA;", "\n");
-
- return result;
- }
-
- private static boolean isEmptyString(String value) {
- if (value == null || value.length() == 0) {
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java
deleted file mode 100644
index fb800aa4c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * This utility class is used to make a bridge between the relative path from
- * webroot and physical path in the project.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class WebrootUtil extends
- org.eclipse.jst.jsf.facesconfig.common.utils.WebrootUtil {
-
- /**
- * get the the project path for webpath The project path is something like
- * "/projectname/webroot/filename.jsp", or "/projectname/webroot/folder".
- * The project information should be removed from project path, e.g,
- * "/filename.jsp" or "/folder/*";
- *
- * @param strPath -
- * the web path
- * @return - project path from "/projectname/webroot"
- */
- static public String getProjectPath(EObject model, String strPath) {
-
- IProject project = getProject(model);
-
- String strProjectPath = "";
- if (strPath != null) {
- IPath path = new Path(strPath);
- // jsp file
- if (path.getFileExtension() != null) {
- if (isValidWebFile(path)) {
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null)
- strProjectPath = webContentPath.toString() + strPath;
-
- }
- } else
- // jsp folder
- {
- strPath = new String(strPath.getBytes(), 0,
- strPath.length() - 1);
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null)
- strProjectPath = webContentPath.toString() + strPath;
- }
- }
- return strProjectPath;
- }
-
-
-
- /**
- * get the current resource according to EMF model
- *
- * @param model -
- * emf model
- * @return
- */
- static public IResource getResource(EObject model) {
- IResource resource = null;
-
- if (model != null && model.eResource() != null) {
- URI uri = model.eResource().getURI();
- Path path = new Path(URI.decode(uri.devicePath()));
-
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace()
- .getRoot();
- resource = workspaceRoot.findMember(path);
- }
-
- return resource;
- }
-
- /**
- * get the current project according to EMF model
- *
- * @param model -
- * emf model
- * @return
- */
- static public IProject getProject(EObject model) {
- IProject project = null;
-
- IResource resource = getResource(model);
-
- if (resource != null) {
- project = resource.getProject();
- }
-
- return project;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java
deleted file mode 100644
index ae1fa5e24..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.List;
-
-/**
- * Specifies behavior for a datasource that client wizards use to communicate
- * summary information to summary page.
- *
- * @author plevin
- * @version 1.0
- */
-public interface ISummaryDataSource {
- /**
- * Returns key-value summary data.
- *
- * @return List - Summary data.
- */
- public List getSummaryData();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java
deleted file mode 100644
index 21eb29c1a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are 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: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaClassUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-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.Label;
-
-/**
- * This class used to select an existing java class or generate a new one.
- * However, the actural generated new java class is left to other pages.
- *
- * @author Xiao-guang Zhang
- */
-public class ManagedBeanClassSelectionPage extends WizardPage {
- private static final int HORIZONTAL_INDENT_DEFAULT = 25;
-
- /** the class name */
- private String className;
-
- /**
- * Search Section, including radio button, label, text and browser button.
- */
- private Button searchRadioButton;
-
- private ClassButtonDialogField classSearchDialogField;
-
- /** selected type */
- private IType searchedType;
-
- /** Generate radio button */
- private Button createRadioButton;
-
- private IProject currentProject;
-
- /**
- * Constructor.
- *
- * @param project
- * The project.
- */
- public ManagedBeanClassSelectionPage(IProject project) {
- super("JavaSelectionWizardPage"); //$NON-NLS-1$
-
- currentProject = project;
- setTitle(WizardMessages.JavaSelectionWizardPage_Title);
- setDescription(WizardMessages.JavaSelectionWizardPage_Description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- Composite container = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 10;
- layout.marginHeight = 5;
- container.setLayout(layout);
- container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- final Group group = new Group(container, SWT.NONE);
-
- group.setLayout(new GridLayout());
-
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createSearchSection(group);
- createGenerateSection(group);
-
- setControl(container);
- Dialog.applyDialogFont(container);
- setPageComplete(classSearchDialogField.getText().length() > 0);
- EditorPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(
- container,
- WizardMessages.JavaSelectionWizardPage_HelpContextID);
- }
-
- /**
- * enabled or disabled the search section including the labels and texts
- *
- * @param enabled -
- * enabled or disabled the search section
- */
- private void enableSearchSection(boolean enabled) {
- classSearchDialogField.setEnabled(enabled);
- }
-
- /**
- * Create the search section including the labels, texts, and browser
- * buttons
- *
- * @param parent -
- * parent composite control
- */
- private void createSearchSection(Composite parent) {
- searchRadioButton = new Button(parent, SWT.RADIO);
- // JavaSelectionWizardPage.Search = Using an existing Java class
- searchRadioButton
- .setText(WizardMessages.JavaSelectionWizardPage_Search);
- searchRadioButton.setSelection(true);
- searchRadioButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- createRadioButton.setSelection(!searchRadioButton
- .getSelection());
- enableSearchSection(searchRadioButton.getSelection());
- verifyComplete();
- }
- });
-
- Composite searchSection = new Composite(parent, SWT.NULL);
-
- classSearchDialogField = new ClassButtonDialogField(currentProject);
- classSearchDialogField.setHyperLink(null);
- int numberOfControls = classSearchDialogField.getNumberOfControls();
-
- GridLayout layout = new GridLayout();
- layout.numColumns = numberOfControls;
- layout.verticalSpacing = 9;
- searchSection.setLayout(layout);
- searchSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- classSearchDialogField.doFillIntoGrid(null, searchSection,
- numberOfControls);
-
- GridData gd = (GridData) classSearchDialogField.getLabelControl(null,
- searchSection).getLayoutData();
- gd.horizontalIndent = HORIZONTAL_INDENT_DEFAULT;
-
- // JavaSelectionWizardPage.Search.ClassName = Qulified class name:
- classSearchDialogField
- .setLabelText(WizardMessages.JavaSelectionWizardPage_Search_ClassName);
-
- LayoutUtil.setHorizontalGrabbing(classSearchDialogField.getTextControl(
- null, searchSection));
-
- classSearchDialogField
- .setDialogFieldChangeListener(new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- className = classSearchDialogField.getText();
- verifyComplete();
- }
-
- });
-
- Label searchDesp = new Label(searchSection, SWT.NONE);
- searchDesp
- .setText(WizardMessages.JavaSelectionWizardPage_Search_Description);
-
- gd = new GridData();
- gd.horizontalSpan = numberOfControls;
- gd.horizontalIndent = HORIZONTAL_INDENT_DEFAULT;
- searchDesp.setLayoutData(gd);
- }
-
- /**
- * Create the generation section including the labels, texts, and browser
- * buttons
- *
- * @param parent -
- * parent composite control
- */
- private void createGenerateSection(Composite parent) {
- createRadioButton = new Button(parent, SWT.RADIO);
- createRadioButton
- .setText(WizardMessages.JavaSelectionWizardPage_Create);
- createRadioButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- searchRadioButton.setSelection(!createRadioButton
- .getSelection());
- enableSearchSection(!createRadioButton.getSelection());
- verifyComplete();
- }
- });
-
- Composite createSection = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.verticalSpacing = 9;
- createSection.setLayout(layout);
- createSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label createDesp = new Label(createSection, SWT.NONE);
- createDesp
- .setText(WizardMessages.JavaSelectionWizardPage_Create_Description);
-
- GridData gd = new GridData();
- gd.horizontalIndent = HORIZONTAL_INDENT_DEFAULT;
- createDesp.setLayoutData(gd);
- }
-
- /**
- * create a new java class or not
- *
- * @return
- */
- public boolean isCreateNewJavaClass() {
- return createRadioButton.getSelection();
- }
-
- /**
- * get the selected java type
- *
- * @return - type
- */
- public IType getSelectedType() {
- searchedType = JavaClassUtils.getType(currentProject,
- classSearchDialogField.getText());
-
- return searchedType;
- }
-
- public String getClassName() {
- return className;
- }
-
- /**
- * validate the selected or input java type name
- *
- * @return
- */
- private IStatus validateJavaTypeName() {
- IStatus status = null;
- if (classSearchDialogField.getText().length() == 0) {
- status = new Status(
- IStatus.ERROR,
- EditorPlugin.getPluginId(),
- -1,
- NLS
- .bind(
- WizardMessages.JavaSelectionWizardPage_Error_ClassIsEmpty,
- classSearchDialogField.getText()), null);
- } else {
- // ensure the name follows the java conventsions.
- status = JavaConventions
- .validateJavaTypeName(classSearchDialogField.getText());
- if (status.getSeverity() != IStatus.ERROR) {
- // ensure the input or selected type is defined in the current
- // project
- if (getSelectedType() == null) {
- status = new Status(
- IStatus.ERROR,
- EditorPlugin.getPluginId(),
- -1,
- NLS
- .bind(
- WizardMessages.JavaSelectionWizardPage_Error_ClassIsNotDefined,
- classSearchDialogField.getText()),
- null);
- }
- }
- }
- return status;
- }
-
- /**
- * verify and update the complete status
- */
- private void verifyComplete() {
- IStatus status = null;
-
- if (isCreateNewJavaClass()) {
- setPageComplete(true);
- setMessage(null);
- setErrorMessage(null);
- } else {
- if (searchRadioButton.getSelection()) {
- status = validateJavaTypeName();
- }
- String errorMessage = null;
- setPageComplete(status.getSeverity() != IStatus.ERROR);
-
- if (status.getSeverity() == IStatus.ERROR) {
- errorMessage = status.getMessage();
- }
-
- if (errorMessage != null) {
- setErrorMessage(errorMessage);
- } else {
- setErrorMessage(null);
- }
-
- if (status.getSeverity() != IStatus.OK) {
- setMessage(status.getMessage());
- } else {
- setMessage(null);
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java
deleted file mode 100644
index 5e1af6b25..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are 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: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaClassUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ManagedBeanUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * ManangedBeanProperty wizard page used to show properties of the previous
- * selected java class, suade services. and set the default values for each
- * property.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class ManagedBeanPropertyPage extends WizardPage implements ISummaryDataSource {
- /** Default height of description Text Control */
- private static final int DESCRIPTION_TEXT_HEIGHT = 60;
-
- private static final int DEFAULT_WIDTHHINT = 10;
-
- /** The Text control for managed bean instance name */
- private Text managedBeanNameText;
-
- /** The Combo control for Project Selection */
- private Combo scopeCombo;
-
- /** The Text control for managed bean's description */
- private Text managedBeanDescriptionText;
-
- private String helpID = null;
-
- private IProject currentProject;
-
- private String defaultScope;
-
- /**
- * @param defaultScope
- * the default scope, if be null, then use "session".
- * @param project
- */
- public ManagedBeanPropertyPage(String defaultScope, IProject project) {
- super("ManagedBeanPropertyWizardPage"); //$NON-NLS-1$);
-
- this.defaultScope = defaultScope;
- currentProject = project;
- setTitle(WizardMessages.ManagedBeanPropertyWizardPage_Title);
- setDescription(WizardMessages.ManagedBeanPropertyWizardPage_Description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see WizardPage#createControl(Composite)
- */
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite container = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- container.setLayout(gl);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gridData);
-
- createGeneralSection(container);
-
- setControl(container);
-
- setPageComplete(false);
-
- if (helpID != null) {
- EditorPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(
- getControl(), helpID);
- }
- }
-
- /**
- * create managed bean 's configuration group
- *
- * @param container
- */
- private void createGeneralSection(Composite container) {
- Group generalSection = new Group(container, SWT.NONE);
-
- // ManagedBeanPropertyWizardPage.General = General
- generalSection
- .setText(WizardMessages.ManagedBeanPropertyWizardPage_General);
-
- GridLayout gl = new GridLayout();
- // gl.marginHeight = 20;
- gl.numColumns = 2;
- generalSection.setLayout(gl);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.setLayoutData(gridData);
-
- SWTUtils
- .createLabel(
- generalSection,
- WizardMessages.ManagedBeanPropertyWizardPage_ManagedBeanName,
- 1);
-
- managedBeanNameText = SWTUtils.createTextBox(generalSection, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- gd.widthHint = DEFAULT_WIDTHHINT;
- managedBeanNameText.setLayoutData(gd);
-
- managedBeanNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- // dialogChanged();
- if (isValidManagedBeanName(true)) {
- setPageComplete(true);
- } else {
- setPageComplete(false);
- }
- }
- });
-
- SWTUtils
- .createLabel(
- generalSection,
- WizardMessages.ManagedBeanPropertyWizardPage_ManagedBeanScope,
- 1); //$NON-NLS-1$
-
- String[] items = {
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_APPLICATION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_REQUEST,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_NONE };
-
- scopeCombo = SWTUtils.createCombo(generalSection, items, 1);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- gd.widthHint = DEFAULT_WIDTHHINT;
- scopeCombo.setLayoutData(gd);
-
- Label labelDesp = SWTUtils
- .createLabel(
- generalSection,
- WizardMessages.ManagedBeanPropertyWizardPage_ManagedBeanDescription,
- 1); //$NON-NLS-1$
-
- gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
- labelDesp.setLayoutData(gd);
-
- managedBeanDescriptionText = SWTUtils.createTextBoxScrollable(
- generalSection, 1, -1, DESCRIPTION_TEXT_HEIGHT);
-
- }
-
- /**
- * Validates the managed bean Name entry
- *
- * @param reportError -
- * true, to report errors.
- * @return boolean - the valid state of the data entered
- */
- private boolean isValidManagedBeanName(boolean reportError) {
- if (managedBeanNameText.getText().length() == 0) {
- if (reportError) {
- setErrorMessage(WizardMessages.ManagedBeanPropertyWizardPage_Warning_MissingManagedBeanName); //$NON-NLS-1$
- }
- return false;
- } else if (JavaClassUtils.hasIllegalCharacters(managedBeanNameText
- .getText())) {
- if (reportError) {
- setErrorMessage(WizardMessages.ManagedBeanPropertyWizardPage_Warning_InvalidManagedBeanName); //$NON-NLS-1$
- }
- return false;
- } else {
- if (ManagedBeanUtil.isBeanDuplicate(currentProject,
- managedBeanNameText.getText())) {
- if (reportError) {
- setErrorMessage(WizardMessages.ManagedBeanPropertyWizardPage_Warning_DuplicateManagedBeanName);
- }
- return false;
- }
-
- }
-
- setErrorMessage(null);
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public void setPreviousPage(IWizardPage page) {
- super.setPreviousPage(page);
- initialize();
- }
-
- protected void initialize() {
- if (defaultScope != null && defaultScope.length() > 0)
- scopeCombo.setText(defaultScope);
- else
- scopeCombo.setText("session");
-
- if (((NewManagedBeanWizard) getWizard()).getSuggestedBeanName() != null) {
- this.managedBeanNameText
- .setText(((NewManagedBeanWizard) getWizard())
- .getSuggestedBeanName());
- } else {
- String beanName;
- if (this.getPreviousPage() instanceof ManagedBeanClassSelectionPage) {
- beanName = ((ManagedBeanClassSelectionPage) this.getPreviousPage())
- .getClassName();
- } else {
- beanName = ((NewJavaClassPage) this.getPreviousPage())
- .getTypeName();
- }
- beanName = beanName.substring(beanName.lastIndexOf(".") + 1);
- if (beanName != null && beanName.length() > 0) {
- beanName = (beanName.substring(0, 1)).toLowerCase()
- + (beanName.substring(1));
-
- beanName = ManagedBeanUtil.getDefaultManagedBeanName(
- currentProject, beanName);
-
- } else
- beanName = "";
- managedBeanNameText.setText(beanName);
- }
- }
-
- /**
- * Returns key-value summary data.
- *
- * @return List - Summary data.
- */
- public List getSummaryData() {
- List data = new ArrayList();
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_ManagedBeanName,
- getManagedBeanName() }); //$NON-NLS-1$
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_ManagedBeanScope,
- getManagedBeanScope() });
- data.add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_ClassName,
- getManagedBeanClass() });
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_Description,
- getManagedBeanDescription() });
- return data;
- }
-
- public String getManagedBeanName() {
- return this.managedBeanNameText.getText().trim();
- }
-
- public String getManagedBeanClass() {
- if (this.getPreviousPage() instanceof ManagedBeanClassSelectionPage) {
- return ((ManagedBeanClassSelectionPage) this.getPreviousPage()).getClassName();
- } else if (this.getPreviousPage() instanceof NewJavaClassPage) {
- NewJavaClassPage newJavaClassPage = (NewJavaClassPage) this.getPreviousPage();
- StringBuffer buffer = new StringBuffer();
- if (newJavaClassPage.getPackageText() != null
- && newJavaClassPage.getPackageText().length() > 0) {
- buffer.append(newJavaClassPage.getPackageText());
- buffer.append("."); //$NON-NLS-1$
- }
- buffer.append(newJavaClassPage.getTypeName());
- return buffer.toString();
- }
-
- return "";//$NON-NLS-1$
- }
-
- public String getManagedBeanScope() {
- return this.scopeCombo.getText().trim();
- }
-
- public String getManagedBeanDescription() {
- return this.managedBeanDescriptionText.getText().trim();
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java
deleted file mode 100644
index 73285acd6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Wizard page to create a new class.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class NewJavaClassPage extends org.eclipse.jdt.ui.wizards.NewClassWizardPage
- implements ISummaryDataSource {
-
- private IProject currentProject;
-
- public NewJavaClassPage(IProject project) {
- super();
- currentProject = project;
- setPageComplete(false);
- }
-
- public void initialize() {
- if (getPackageFragmentRoot() == null
- || currentProject != getPackageFragmentRoot().getJavaProject()
- .getProject()) {
- IJavaProject jProject = JavaCore.create(currentProject);
- StructuredSelection selection = new StructuredSelection(jProject);
- init(selection);
- }
- }
-
- private boolean isSkipped() {
- if ((getPreviousPage() instanceof ManagedBeanClassSelectionPage)
- && !((ManagedBeanClassSelectionPage) getPreviousPage()).isCreateNewJavaClass())
- return true;
- return false;
- }
-
- public List getSummaryData() {
- List data = new ArrayList();
-
- if (!isSkipped()) {
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_SourceFolder,
- getPackageFragmentRootText(), }); //$NON-NLS-1$
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_PackageName, //$NON-NLS-1$
- getPackageText(), });
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_TypeName, //$NON-NLS-1$
- getTypeName() });
- }
- return data;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public void setPreviousPage(IWizardPage page) {
- super.setPreviousPage(page);
- initialize();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java
deleted file mode 100644
index 374eaf7d0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are 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: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.facesconfig.common.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-
-/**
- * The wizard for creating a managed bean on faces config model.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class NewManagedBeanWizard extends Wizard implements ISummaryDataSource {
-
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(NewManagedBeanWizard.class);
-
- /**
- * The wizard page where user can select a Java class for the managed bean
- * to be created.
- */
- private ManagedBeanClassSelectionPage managedBeanClassSelectionPage;
-
- /**
- * The wizard page where user can create a new Java class for the managed
- * bean to be created.
- */
- private NewJavaClassPage newJavaClassPage;
-
- private ManagedBeanPropertyPage managedBeanPropertyPage;
-
- public String managedBeanName;
-
- public String managedBeanScope;
-
- public String managedBeanClass;
-
- public String managedBeanDescription;
-
- private IProject project;
-
- /**
- * the suggested name for the managed bean, if setted, then use it in
- * ManagedBeanPropertyWizardPage.
- */
- private String suggestedBeanName;
-
- private String defaultScope;
-
- /**
- * Constructor
- *
- * @param project
- * The project.
- */
- public NewManagedBeanWizard(IProject project) {
- super();
- setWindowTitle(WizardMessages.NewManagedBeanWizardBase_Title);
- this.project = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.wizards.NewWizard#addPages()
- */
- public void addPages() {
- setDialogSettings(EditorPlugin.getDefault().getDialogSettings());
-
- // add java source selection page.
- managedBeanClassSelectionPage = new ManagedBeanClassSelectionPage(project);
- addPage(managedBeanClassSelectionPage);
-
- // add the class type page
- newJavaClassPage = new NewJavaClassPage(project);
- addPage(newJavaClassPage);
-
- managedBeanPropertyPage = new ManagedBeanPropertyPage(defaultScope, project);
- addPage(managedBeanPropertyPage);
-
- // // add the summary page
- SummaryPage summaryPage = new SummaryPage(this);
- addPage(summaryPage);
- summaryPage
- .setDescription(WizardMessages.NewJavaManagedBeanWizard_SummaryPage_Description);
- }
-
- /**
- * Skip the NewJavaClassPage when user select "Using an existing class" on the
- * ManagedBeanClassSelectionPage.
- */
- public IWizardPage getNextPage(IWizardPage page) {
- IWizardPage nextPage = super.getNextPage(page);
- if (page instanceof ManagedBeanClassSelectionPage
- && !((ManagedBeanClassSelectionPage) page).isCreateNewJavaClass()) {
- ((WizardPage) nextPage).setPageComplete(true);
- return getNextPage(nextPage);
- }
- return nextPage;
- }
-
- public boolean performFinish() {
-
- managedBeanName = managedBeanPropertyPage.getManagedBeanName();
- managedBeanClass = managedBeanPropertyPage.getManagedBeanClass();
- managedBeanScope = managedBeanPropertyPage.getManagedBeanScope();
- managedBeanDescription = managedBeanPropertyPage.getManagedBeanDescription();
- if (managedBeanClassSelectionPage.isCreateNewJavaClass())
- createNewJavaClass();
-
- return true;
- }
-
- /**
- * create a new java class according to current inputs in
- * NewClassWizardPage.
- */
- private void createNewJavaClass() {
- try {
- newJavaClassPage.createType(new NullProgressMonitor());
- } catch (CoreException e) {
- log.info("NewJavaManagedBeanWizard.Error.CreateType", e); //$NON-NLS-1$
-
- EditorPlugin.getAlerts().error(
- "NewJavaManagedBeanWizard.Alert.CreateType.Title", //$NON-NLS-1$
- "NewJavaManagedBeanWizard.Alert.CreateType.Description"); //$NON-NLS-1$
- return;
- } catch (InterruptedException e) {
- log.info("NewJavaManagedBeanWizard.Error.CreateType", e); //$NON-NLS-1$
- EditorPlugin.getAlerts().error(
- "NewJavaManagedBeanWizard.Alert.CreateType.Title", //$NON-NLS-1$
- "NewJavaManagedBeanWizard.Alert.CreateType.Description"); //$NON-NLS-1$
- return;
- }
- newJavaClassPage.getCreatedType();
- }
-
- /**
- * @return
- */
- public String getSuggestedBeanName() {
- return suggestedBeanName;
- }
-
- /**
- * Set a name for the new managed bean, this name will be shown in the
- * ManagedBeanPropertyWizardPage. If don't set the name, then will get a
- * default bean name from the managed bean class name.
- *
- * @param suggestedBeanName
- */
- public void setSuggestedBeanName(String suggestedBeanName) {
- this.suggestedBeanName = suggestedBeanName;
- }
-
- /**
- * @return
- */
- public String getDefaultScope() {
- return defaultScope;
- }
-
- /**
- * set a default scope value for this new managed bean.
- *
- * @param defaultScope
- */
- public void setDefaultScope(String defaultScope) {
- this.defaultScope = defaultScope;
- }
-
- public String getManagedBeanClass() {
- return managedBeanClass;
- }
-
- public String getManagedBeanDescription() {
- return managedBeanDescription;
- }
-
- public String getManagedBeanName() {
- return managedBeanName;
- }
-
- public String getManagedBeanScope() {
- return managedBeanScope;
- }
-
- public List getSummaryData() {
- List data = new ArrayList();
- IWizardPage[] pages = getPages();
-
- for (int i = 0; i < pages.length; i++) {
- if (pages[i] instanceof ISummaryDataSource) {
-
- data.addAll(((ISummaryDataSource) pages[i]).getSummaryData());
- }
- }
- return data;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java
deleted file mode 100644
index 88fab670e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are 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: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * Common wizard page used to summarize information entered in previous pages.
- *
- * @author plevin
- * @version 1.0
- */
-public class SummaryPage extends WizardPage
-{
- private static final String WIZARD_SUMMARY_PAGE = "WizardSummaryPage";
-
- /** The source of the summary items */
- private ISummaryDataSource source;
-
- /** The table control that displays the summary items */
- private Table table;
-
- /**
- * This Constructor creates the summary page
- */
- public SummaryPage()
- {
- super( WIZARD_SUMMARY_PAGE );
- setTitle( WizardMessages.WizardSummaryPage_Title_WizardSummary );
- setDescription( WizardMessages.WizardSummaryPage_Summary_SummaryDesc );
- }
-
- /**
- * This Constructor initializes the data source.
- *
- * @param source -
- * Summary data source
- */
- public SummaryPage( ISummaryDataSource source )
- {
- this();
- this.source = source;
- }
-
- /**
- * Determines if the wizard can enable the Next button
- *
- * @return boolean - the state of the Next button
- */
- public boolean canFlipToNextPage()
- {
- return false;
- }
-
- /**
- * Creates the page controls
- *
- * @param parent -
- * the wizard composite
- */
- public void createControl( Composite parent )
- {
-
- Composite composite = SWTUtils.createComposite( parent, 1 );
-
- table = new Table( composite, SWT.BORDER );
- table.setLayoutData( new GridData( GridData.FILL_BOTH ) );
- table.setHeaderVisible( true );
- table.setLinesVisible( true );
-
- TableLayout layout = new TableLayout();
- table.setLayout( layout );
-
- layout.addColumnData( new ColumnPixelData( 163 ) );
- layout.addColumnData( new ColumnPixelData( 350 ) );
-
- TableColumn keyCol = new TableColumn( table, SWT.NONE );
- keyCol.setText( WizardMessages.WizardSummaryPage_Label_Field );
-
- TableColumn valueCol = new TableColumn( table, SWT.NONE );
- valueCol
- .setText( WizardMessages.WizardSummaryPage_Label_Value );
-
- setControl( composite );
- setPageComplete( true );
- }
-
- /**
- * Populates the table with summary information.
- */
- public void loadSummaryData()
- {
- if ( source == null )
- {
- return;
- }
- Object[] data = source.getSummaryData().toArray();
- table.removeAll();
- for ( int i = 0; i < data.length; i++ )
- {
- TableItem item = new TableItem( table, SWT.NONE );
- item.setText( (String[]) data[i] );
- }
- return;
- }
-
- /**
- * Sets summary page data source.
- *
- * @param s -
- * Data source.
- */
- public void setSummaryDataSource( ISummaryDataSource s )
- {
- source = s;
- }
-
- /**
- * Populates the table with summary items when the page becomes visible.
- *
- * @param visible -
- * the visible state of the page
- */
- public void setVisible( boolean value )
- {
- super.setVisible( value );
-
- if ( value == true )
- {
- loadSummaryData();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java
deleted file mode 100644
index 69b46ee78..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WizardMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.wizard.WizardMessages";
-
- private WizardMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WizardMessages.class);
- }
-
- public static String NewManagedBeanWizardBase_Type;
-
- public static String NewManagedBeanWizardBase_Description;
-
- public static String NewManagedBeanWizardBase_Title;
-
- public static String NewManagedBeanCreationWizard_Title;
-
- public static String IntroWizardPage_Title;
-
- public static String IntroWizardPage_Intro;
-
- public static String ManagedBeanWizardSelectionPage_Title;
-
- public static String ManagedBeanWizardSelectionPage_Description;
-
- public static String ManagedBeanWizardSelectionPage_Group;
-
- public static String ManagedBeanWizardSelectionPage_HelpContextID;
-
- public static String Registry_LoadWizard_Error;
-
- public static String NewWizard_Title_WizardDefault;
-
- public static String ManagedBeanPropertyWizardPage_Title;
-
- public static String ManagedBeanPropertyWizardPage_Description;
-
- public static String ManagedBeanPropertyWizardPage_General;
-
- public static String ManagedBeanPropertyWizardPage_ManagedBeanName;
-
- public static String ManagedBeanPropertyWizardPage_ManagedBeanScope;
-
- public static String ManagedBeanPropertyWizardPage_ManagedBeanDescription;
-
- public static String ManagedBeanPropertyWizardPage_ManagedBeanProperty;
-
- public static String ManagedBeanPropertyWizardPage_PropertyName;
-
- public static String ManagedBeanPropertyWizardPage_Type;
-
- public static String ManagedBeanPropertyWizardPage_Value;
-
- public static String ManagedBeanPropertyWizardPage_Button_Add;
-
- public static String ManagedBeanPropertyWizardPage_Button_Edit;
-
- public static String ManagedBeanPropertyWizardPage_Button_Remove;
-
- public static String ManagedBeanPropertyWizardPage_Warning_MissingManagedBeanName;
-
- public static String ManagedBeanPropertyWizardPage_Warning_InvalidManagedBeanName;
-
- public static String ManagedBeanPropertyWizardPage_Warning_DuplicateManagedBeanName;
-
- public static String ManagedBeanPropertyEditDialog_PropertyName;
-
- public static String ManagedBeanPropertyEditDialog_DataType;
-
- public static String ManagedBeanPropertyEditDialog_InitialValue;
-
- public static String ManagedBeanPropertyEditDialog_Title_NewPropertyEntry;
-
- public static String ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry;
-
- public static String FacesConfigSelectionWizardPage_Title;
-
- public static String FacesConfigSelectionWizardPage_Description;
-
- public static String FacesConfigSelectionWizardPage_Project;
-
- public static String FacesConfigSelectionWizardPage_FacesConfig;
-
- public static String FacesConfigSelectionWizardPage_FacesConfig_Browser;
-
- public static String FacesConfigSelectionWizardPage_Warning_MissingProjectName;
-
- public static String FacesConfigSelectionWizardPage_Warning_MissingFacesConfigName;
-
- public static String FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigName;
-
- public static String FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigContent;
-
- public static String FacesConfigSelectionWizardPage_Warning_FacesConfigNotDefinedInWebDotXML;
-
- public static String FacesConfigSelectionWizardPage_HelpContextID;
-
- public static String FacesConfigFileSelectionDialog_Title;
-
- public static String FacesConfigFileSelectionDialog_Description;
-
- public static String JavaSelectionWizardPage_Title;
-
- public static String JavaSelectionWizardPage_Description;
-
- public static String JavaSelectionWizardPage_Group;
-
- public static String JavaSelectionWizardPage_Search;
-
- public static String JavaSelectionWizardPage_Search_Description;
-
- public static String JavaSelectionWizardPage_Search_ClassName;
-
- public static String JavaSelectionWizardPage_Search_ClassName_Browse;
-
- public static String JavaSelectionWizardPage_Create;
-
- public static String JavaSelectionWizardPage_Create_Description;
-
- public static String JavaSelectionWizardPage_FindType;
-
- public static String JavaSelectionWizardPage_FindType_Filter;
-
- public static String JavaSelectionWizardPage_Error_ClassIsEmpty;
-
- public static String JavaSelectionWizardPage_Error_ClassIsNotDefined;
-
- public static String JavaSelectionWizardPage_HelpContextID;
-
- public static String NewJavaManagedBeanWizard_Summary_ProjectName;
-
- public static String NewJavaManagedBeanWizard_Summary_FacesConfigFileName;
-
- public static String NewJavaManagedBeanWizard_Summary_TypeName;
-
- public static String NewJavaManagedBeanWizard_Summary_PackageName;
-
- public static String NewJavaManagedBeanWizard_Summary_SourceFolder;
-
- public static String NewJavaManagedBeanWizard_Summary_ManagedBeanName;
-
- public static String NewJavaManagedBeanWizard_Summary_ManagedBeanScope;
-
- public static String NewJavaManagedBeanWizard_Summary_ClassName;
-
- public static String NewJavaManagedBeanWizard_Summary_Description;
-
- public static String NewJavaManagedBeanWizard_SummaryPage_Description;
-
- public static String NewJavaManagedBeanWizard_Task_CreateNewManagedBean;
-
- public static String NewJavaManagedBeanWizard_Task_CreateNewJavaClass;
-
- public static String DuplicateBeanWizard_Title;
-
- public static String DuplicateBeanPage_Title;
-
- public static String DuplicateBeanPage_Description;
-
- public static String DuplicateBeanGroup_Group_Label;
-
- public static String DuplicateBeanGroup_OverwriteButton_Text;
-
- public static String DuplicateBeanGroup_NewButton_Text;
-
- public static String DuplicateBeanGroup_NewNameDialogField_Label;
-
- public static String DuplicateBeanGroup_Error_EmptyManagedBeanName;
-
- public static String DuplicateBeanGroup_Error_InvalidManagedBeanName;
-
- public static String DuplicateBeanGroup_Error_DuplicatedManagedBeanName;
-
- public static String WizardSummaryPage_Title_WizardSummary;
-
- public static String WizardSummaryPage_Summary_SummaryDesc;
-
- public static String WizardSummaryPage_Label_Field;
-
- public static String WizardSummaryPage_Label_Value;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties
deleted file mode 100644
index bc0d428bf..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties
+++ /dev/null
@@ -1,118 +0,0 @@
-NewManagedBeanWizardBase_Type = ManagedBeanTypeName
-NewManagedBeanWizardBase_Description = ManagedBeanTypeDescription
-NewManagedBeanWizardBase_Title = New Managed Bean Wizard
-
-NewManagedBeanCreationWizard_Title = Create a Managed Bean
-
-IntroWizardPage_Title = Introduction Page
-IntroWizardPage_Intro = This wizard walks through the steps to create a managed bean.
-
-ManagedBeanWizardSelectionPage_Title = Managed Bean Selection Page
-ManagedBeanWizardSelectionPage_Description = Select a managed bean type to proceed
-ManagedBeanWizardSelectionPage_Group = Please select the managed bean type:
-ManagedBeanWizardSelectionPage_HelpContextID = com.sybase.stf.jmt.new_managedbean_wizard
-
-Registry_LoadWizard_Error = Error loading wizard element, couldn't initialize!
-####################################################
-# Resource message for NewWizard
-####################################################
-NewWizard_Title_WizardDefault = call setWindowTitle(String) in your wizard sub-class
-
-##################################################################
-# Resource message for NewJavaManagedBeanWizards and its' pages.
-##################################################################
-ManagedBeanPropertyWizardPage_Title = Managed Bean Configuration
-ManagedBeanPropertyWizardPage_Description = Set managed bean's name and scope, and create or update Managed Bean's properties, their types and default values.
-
-ManagedBeanPropertyWizardPage_General = General
-
-ManagedBeanPropertyWizardPage_ManagedBeanName = Name:
-ManagedBeanPropertyWizardPage_ManagedBeanScope = Scope:
-ManagedBeanPropertyWizardPage_ManagedBeanDescription = Description:
-
-ManagedBeanPropertyWizardPage_ManagedBeanProperty = Properties:
-ManagedBeanPropertyWizardPage_PropertyName = Property Name
-ManagedBeanPropertyWizardPage_Type = Property Type
-ManagedBeanPropertyWizardPage_Value = Value
-ManagedBeanPropertyWizardPage_Button_Add = Add...
-ManagedBeanPropertyWizardPage_Button_Edit = Edit...
-ManagedBeanPropertyWizardPage_Button_Remove = Remove
-
-ManagedBeanPropertyWizardPage_Warning_MissingManagedBeanName = Managed bean name must be entered!
-ManagedBeanPropertyWizardPage_Warning_InvalidManagedBeanName = Managed bean name is not valid!
-ManagedBeanPropertyWizardPage_Warning_DuplicateManagedBeanName = Managed bean name can not be duplicate!
-
-ManagedBeanPropertyEditDialog_PropertyName = Property name:
-ManagedBeanPropertyEditDialog_DataType = Data type:
-ManagedBeanPropertyEditDialog_InitialValue = Initial value:
-
-ManagedBeanPropertyEditDialog_Title_NewPropertyEntry = New Property Entry
-ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry = Existing Property Entry
-
-FacesConfigSelectionWizardPage_Title = Faces-Config File
-FacesConfigSelectionWizardPage_Description = Select an existing faces-config file, such as faces-config.xml, to save the new managed bean.
-
-FacesConfigSelectionWizardPage_Project = Project name:
-FacesConfigSelectionWizardPage_FacesConfig = Faces-Config file:
-FacesConfigSelectionWizardPage_FacesConfig_Browser = Browse...
-
-FacesConfigSelectionWizardPage_Warning_MissingProjectName = Project name must be entered!
-FacesConfigSelectionWizardPage_Warning_MissingFacesConfigName = Faces-Config file name must be entered!
-FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigName = Faces-config file name does not exist!
-FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigContent = ''{0}'' is not a valid faces-config file!
-FacesConfigSelectionWizardPage_Warning_FacesConfigNotDefinedInWebDotXML = ''{0}'' is not specified in web.xml file!
-FacesConfigSelectionWizardPage_HelpContextID = com.sybase.stf.jmt.select_facesconfig_page
-
-FacesConfigFileSelectionDialog_Title = Faces-config File Selection
-FacesConfigFileSelectionDialog_Description = Select a faces-config file in the current project.
-
-JavaSelectionWizardPage_Title = Java Class Selection
-JavaSelectionWizardPage_Description = Search for an existing class or generate a new one.
-JavaSelectionWizardPage_Group = Source type for Java class
-JavaSelectionWizardPage_Search = Using an existing Java class
-JavaSelectionWizardPage_Search_Description = (This option will use an existing java class as managed bean's type.)
-JavaSelectionWizardPage_Search_ClassName = Qualified class name:
-JavaSelectionWizardPage_Search_ClassName_Browse = Browse...
-JavaSelectionWizardPage_Create = Create a new Java class
-JavaSelectionWizardPage_Create_Description = (This option will create a new java class in the next wizard page.)
-
-JavaSelectionWizardPage_FindType = Find Type
-JavaSelectionWizardPage_FindType_Filter = Choose a type (?=any character, *=any string):
-JavaSelectionWizardPage_Error_ClassIsEmpty = The type name should not be empty.
-JavaSelectionWizardPage_Error_ClassIsNotDefined = The type name ''{0}'' does not exist.
-JavaSelectionWizardPage_HelpContextID = com.sybase.stf.jmt.new_java_managedbean_wizard
-
-NewJavaManagedBeanWizard_Summary_ProjectName = Project name
-NewJavaManagedBeanWizard_Summary_FacesConfigFileName = Faces-Config file name
-NewJavaManagedBeanWizard_Summary_TypeName = Type name
-NewJavaManagedBeanWizard_Summary_PackageName = Package name
-NewJavaManagedBeanWizard_Summary_SourceFolder = Source folder
-NewJavaManagedBeanWizard_Summary_ManagedBeanName = Managed bean name
-NewJavaManagedBeanWizard_Summary_ManagedBeanScope = Managed bean scope
-NewJavaManagedBeanWizard_Summary_ClassName = Managed bean class
-NewJavaManagedBeanWizard_Summary_Description = Description
-NewJavaManagedBeanWizard_SummaryPage_Description = A new java managed bean will be created.
-
-NewJavaManagedBeanWizard_Task_CreateNewManagedBean = Creating a new managed bean
-NewJavaManagedBeanWizard_Task_CreateNewJavaClass = Creating a new java class
-
-DuplicateBeanWizard_Title = Set Duplicated Managed Bean
-DuplicateBeanPage_Title = Set duplicated managed bean
-DuplicateBeanPage_Description = Overwrite the duplicated managed bean or create a new one.
-
-DuplicateBeanGroup_Group_Label = Duplicated Managed Bean Options
-DuplicateBeanGroup_OverwriteButton_Text = Overwrite an existing managed bean using the new one
-
-DuplicateBeanGroup_NewButton_Text = Create a new managed bean
-DuplicateBeanGroup_NewNameDialogField_Label = New managed bean name:
-
-DuplicateBeanGroup_Error_EmptyManagedBeanName = The managed bean name can not be empty.
-DuplicateBeanGroup_Error_InvalidManagedBeanName = The managed bean name ''{0}'' contains invalid string, such as #,!.
-DuplicateBeanGroup_Error_DuplicatedManagedBeanName = The managed bean name ''{0}'' is duplicated.
-
-WizardSummaryPage_Title_WizardSummary = Wizard Summarys
-WizardSummaryPage_Summary_SummaryDesc = A new java managed bean will be created.
-WizardSummaryPage_Label_Field = Field
-WizardSummaryPage_Label_Value = Value
-
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/.classpath b/jsf/plugins/org.eclipse.jst.jsf.ui/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.ui/.cvsignore
deleted file mode 100644
index 7033a799b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot*
-temp.folder
-build.xml
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/.project b/jsf/plugins/org.eclipse.jst.jsf.ui/.project
deleted file mode 100644
index 45f845d24..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 943c5d0da..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 24 18:04:28 PDT 2006
-eclipse.preferences.version=1
-encoding//src/org/eclipse/jst/jsf/ui/internal/messages.properties=8859_1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index d720a3501..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.ui; singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.ui.internal.JSFUiPlugin
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsf.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.server.core,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.core.resources,
- org.eclipse.jst.j2ee,
- org.eclipse.emf.common,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.ui.ide,
- org.eclipse.jst.j2ee.core,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.jst.jsf.validation.el
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.jsf.ui.internal;x-friends:="org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.ui.internal.classpath;x-friends:="org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.ui.internal.jsflibraryconfig,
- org.eclipse.jst.jsf.ui.internal.project.facet;x-friends:="org.eclipse.jst.jsf.ui.tests"
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/build.properties b/jsf/plugins/org.eclipse.jst.jsf.ui/build.properties
deleted file mode 100644
index c32d52b6f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- icons/,\
- plugin.properties
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/full/wizban/addlibrary_wiz.gif b/jsf/plugins/org.eclipse.jst.jsf.ui/icons/full/wizban/addlibrary_wiz.gif
deleted file mode 100644
index 128c9d190..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/full/wizban/addlibrary_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_l_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_l_obj.gif
deleted file mode 100644
index 6cb185cff..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_l_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_obj.gif
deleted file mode 100644
index 2fa1d777b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/library_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/library_obj.gif
deleted file mode 100644
index cb55e33b5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/icons/obj16/library_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties
deleted file mode 100644
index fb26a385d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-plugin.name=JavaServer Faces UI Plug-in
-plugin.provider=Eclipse.org
-
-jsf.library.reference=JSF Library Reference \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml
deleted file mode 100644
index dfa4a815b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <!-- JSF Project Facet -->
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.wst.sse.ui.internal.provisional.preferences"
- class="org.eclipse.jst.jsf.ui.internal.classpath.JSFLibrariesPreferencePage"
- id="org.eclipse.jst.jsf.ui.jsfLibraryPage"
- name="JSF Libraries"/>
- <page
- category="org.eclipse.wst.sse.ui.internal.provisional.preferences"
- class="org.eclipse.jst.jsf.ui.internal.validation.JSFValidationPreferencePage"
- id="org.eclipse.jst.jsf.ui.JSFValidationPage"
- name="JSF Validation"/>
- </extension>
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- id="org.eclipse.jst.jsf.ui.jsfcategory"
- name="JavaServer Faces"/>
- <wizard
- canFinishEarly="false"
- category="org.eclipse.jst.jsf.ui.jsfcategory"
- class="org.eclipse.jst.jsf.ui.internal.classpath.JSFLibraryWizard"
- hasPages="true"
- icon="icons/obj16/library_obj.gif"
- id="org.eclipse.jst.jsf.ui.jsfLibraryWizard"
- name="New JSF Library"
- preferredPerspectives="org.eclipse.jst.j2ee.J2EEPerspective"/>
- </extension>
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- adaptable="true"
- class="org.eclipse.jst.jsf.ui.internal.jsflibraryconfig.JSFLibraryPropertyPage"
- id="org.eclipse.jst.jsf.ui.properties.jsfLibraryPropertyPage"
- name="%jsf.library.reference"
- objectClass="org.eclipse.core.resources.IProject">
- <filter
- name="nature"
- value="org.eclipse.wst.common.project.facet.core.nature"/>
- </page>
- </extension>
- <extension
- point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="jst.jsf.v11.install">
- <page class="org.eclipse.jst.jsf.ui.internal.project.facet.JSFFacetInstallPage"/>
- </wizard-pages>
- <wizard-pages action="jst.jsf.v12.install">
- <page class="org.eclipse.jst.jsf.ui.internal.project.facet.JSFFacetInstallPage"/>
- </wizard-pages>
- </extension>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/JSFUiPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/JSFUiPlugin.java
deleted file mode 100644
index 88ab4e35e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/JSFUiPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- * Ian Trimble - added logging methods
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * JSF UI plugin.
- *
- * @author Gerry Kessler - Oracle, Ian Trimble - Oracle
- */
-public class JSFUiPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.jsf.ui.internal.JSFUiPlugin"; //$NON-NLS-1$
- //The shared instance.
- private static JSFUiPlugin plugin;
-
- /**
- * The constructor.
- */
- public JSFUiPlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSFUiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- path = "icons/" + path; //$NON-NLS-1$
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.jst.jsf.ui", path); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity Severity (IStatus constant) of log entry
- * @param message Human-readable message describing log entry
- * @param ex Throwable instance (can be null)
- */
- public static void log(int severity, String message, Throwable ex) {
- getDefault().getLog().log(new Status(severity, PLUGIN_ID, IStatus.OK, message, ex));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity Severity (IStatus constant) of log entry
- * @param message Human-readable message describing log entry
- */
- public static void log(int severity, String message) {
- log(severity, message, null);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/Messages.java
deleted file mode 100644
index 978f6cfa4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/Messages.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- * Ian Trimble - changed to work correctly with org.eclipse.osgi.util.NLS
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * String resource handler.
- *
- * @author Gerry Kessler - Oracle, Ian Trimble - Oracle
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.ui.internal.messages"; //$NON-NLS-1$
-
- public static String JSFFacetInstallPage_JSFLibraryLabel0;
-
- public static String JSFFacetInstallPage_title;
- public static String JSFFacetInstallPage_description;
- public static String JSFFacetInstallPage_JSFImplLabel;
- public static String JSFFacetInstallPage_Add1;
- public static String JSFFacetInstallPage_Add2;
- public static String JSFFacetInstallPage_DeployJarsLabel;
- public static String JSFFacetInstallPage_JSFConfigLabel;
- public static String JSFFacetInstallPage_JSFServletNameLabel;
- public static String JSFFacetInstallPage_JSFURLMappingLabel;
- public static String JSFFacetInstallPage_PatternDialogTitle;
- public static String JSFFacetInstallPage_PatternDialogDesc;
- public static String JSFFacetInstallPage_Remove;
- public static String JSFFacetInstallPage_PatternEmptyMsg;
- public static String JSFFacetInstallPage_PatternSpecifiedMsg;
- public static String JSFFacetInstallPage_ErrorNoWebAppDataModel;
-
- public static String JSFLibrariesPreferencePage_DefinedJSFLibraries;
- public static String JSFLibrariesPreferencePage_New;
- public static String JSFLibrariesPreferencePage_Edit;
- public static String JSFLibrariesPreferencePage_Remove;
- public static String JSFLibrariesPreferencePage_CannotRemovePluginProvidedTitle;
- public static String JSFLibrariesPreferencePage_CannotRemovePluginProvidedMessage;
- public static String JSFLibrariesPreferencePage_MakeDefault;
- public static String JSFLibrariesPreferencePage_Description;
- public static String JSFLibrariesPreferencePage_CannotModifyPluginProvidedTitle;
- public static String JSFLibrariesPreferencePage_CannotModifyPluginProvidedMessage;
-
- public static String JSFLibraryConfigControl_Add;
-
- public static String JSFLibraryConfigControl_AddAll;
-
- public static String JSFLibraryConfigControl_ComponentLibrary;
-
- public static String JSFLibraryConfigControl_DeployJAR;
-
- public static String JSFLibraryConfigControl_ImplementationLibrary;
-
- public static String JSFLibraryConfigControl_NewComponentLibrary;
-
- public static String JSFLibraryConfigControl_NewImplementationLibrary;
-
- public static String JSFLibraryConfigControl_Remove;
-
- public static String JSFLibraryConfigControl_RemoveAll;
-
- public static String JSFLibraryConfigControl_TH_Deploy;
-
- public static String JSFLibraryConfigControl_TH_LibraryName;
-
- public static String JSFLibraryContainerWizardPage_PageName;
- public static String JSFLibraryContainerWizardPage_Title;
- public static String JSFLibraryContainerWizardPage_Description;
- public static String JSFLibraryContainerWizardPage_WarningNoJSFFacet;
- public static String JSFLibraryContainerWizardPage_JSFLibraries;
- public static String JSFLibraryContainerWizardPage_Add;
- public static String JSFLibraryContainerWizardPage_ErrorInitializing;
-
- public static String JSFLibraryWizard_DESCRIPTION;
- public static String JSFLibraryWizard_IMPLS_ONLY_DESC;
- public static String JSFLibraryWizard_CreateImplementation;
- public static String JSFLibraryWizard_CreateJSFLibrary;
- public static String JSFLibraryWizard_EditJSFLibrary;
- public static String JSFLibraryWizard_JSFLibrary;
- public static String JSFLibraryWizard_LibraryName;
- public static String JSFLibraryWizard_VersionSupported;
- public static String JSFLibraryWizard_LibraryJars;
- public static String JSFLibraryWizard_IsJSFImplementation;
- public static String JSFLibraryWizard_DeployJars;
- public static String JSFLibraryWizard_Add;
- public static String JSFLibraryWizard_Remove;
- public static String JSFLibraryWizard_ExtJarFileDialogTitle;
- public static String JSFLibraryWizard_ValidateNoJars;
- public static String JSFLibraryWizard_ValidateNoLibraryName;
- public static String JSFLibraryWizard_ValidateExistingLibraryName;
-
- /**
- * Title set on the el validation preference panel
- */
- public static String JSFValidationPreferencePage_ELPrefPanel_Title;
- /**
- * Title set on the checkbox that enables/disables build validation for EL
- */
- public static String JSFValidationPreferencePage_ELPrefPanel_BuildValidationCheckBoxTitle;
- /**
- * Title set on the checkbox that enables/disables incremental (as you type)
- * validation for EL
- */
- public static String JSFValidationPreferencePage_ELPrefPanel_IncrementalValidationCheckBoxTitle;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java
deleted file mode 100644
index f9821a823..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibrariesPreferencePage.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.classpath;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.PluginProvidedJSFLibrary;
-import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
-import org.eclipse.jst.jsf.ui.internal.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * Provides a preference page for JSF Libraries.
- *
- * @author Gerry Kessler - Oracle
- */
-public class JSFLibrariesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage{
- private IWorkbench wb;
-
- private TreeViewer tv;
- private TreeViewerAdapter tvAdapter;
- private TreeLabelProvider tvLabelProvider;
-
- private Composite btnComp;
-
- private Button btnNew;
- private Button btnEdit;
- private Button btnDelete;
- private Button btnMakeDefaultImpl;
-
- protected Control createContents(Composite parent) {
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayout(new GridLayout(2, false));
- c.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label lblLibs = new Label(c, SWT.NONE);
- lblLibs.setText(Messages.JSFLibrariesPreferencePage_DefinedJSFLibraries);
- GridData gd1 = new GridData();
- gd1.horizontalSpan = 2;
- lblLibs.setLayoutData(gd1);
-
- tv = new TreeViewer(c, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- tvAdapter = new TreeViewerAdapter();
- tvLabelProvider = new TreeLabelProvider();
- tv.setContentProvider(tvAdapter);
- tv.setLabelProvider(tvLabelProvider);
- tv.addSelectionChangedListener(tvAdapter);
- tv.addDoubleClickListener(tvAdapter);
- tv.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
- tv.setInput(getJSFLibraries());
-
- createButtons(c);
-
- return c;
- }
-
- private void createButtons(Composite c){
- btnComp = new Composite(c, SWT.NONE);
- GridLayout gl1 = new GridLayout(1, false);
- gl1.marginHeight = 0;
- gl1.marginWidth = 0;
- btnComp.setLayout(gl1);
- btnComp.setLayoutData(new GridData(GridData.END | GridData.VERTICAL_ALIGN_FILL));
-
- btnNew = new Button(btnComp, SWT.NONE);
- btnNew.setText(Messages.JSFLibrariesPreferencePage_New);
- btnNew.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
- btnNew.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- openJSFLibraryEditDialog(null);
- }
- });
-
- btnEdit = new Button(btnComp, SWT.NONE);
- btnEdit.setText(Messages.JSFLibrariesPreferencePage_Edit);
- btnEdit.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
- btnEdit.setEnabled(false);
- btnEdit.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- TreeItem[] element = (TreeItem[]) tv.getTree().getSelection();
- if (element != null){
- openJSFLibraryEditDialog(element[0]);
- }
-
- }
- });
-
- btnDelete = new Button(btnComp, SWT.NONE);
- btnDelete.setText(Messages.JSFLibrariesPreferencePage_Remove);
- btnDelete.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
- btnDelete.setEnabled(false);
- btnDelete.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e) {
- boolean modified = false;
- if (tv.getSelection() instanceof StructuredSelection){
- StructuredSelection objs = (StructuredSelection)tv.getSelection();
- if (objs != null){
- Iterator it = objs.iterator();
- while (it.hasNext()){
- JSFLibrary lib = (JSFLibrary)it.next();
- if (lib instanceof PluginProvidedJSFLibrary)
- MessageDialog.openInformation(
- getShell(),
- Messages.JSFLibrariesPreferencePage_CannotRemovePluginProvidedTitle,
- Messages.JSFLibrariesPreferencePage_CannotRemovePluginProvidedMessage);
-
- else {
- JSFCorePlugin.getDefault().getJSFLibraryRegistry().removeJSFLibrary(lib);
- modified = true;
- }
- }
- if (modified){
- JSFCorePlugin.getDefault().saveJSFLibraryRegistry();
- tv.refresh();
- }
- }
- }
- }
- });
-
- btnMakeDefaultImpl = new Button(btnComp, SWT.NONE);
- btnMakeDefaultImpl.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_END));
- btnMakeDefaultImpl.setText(Messages.JSFLibrariesPreferencePage_MakeDefault);
- btnMakeDefaultImpl.setVisible(false);
- btnMakeDefaultImpl.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (tv.getSelection() instanceof StructuredSelection){
- StructuredSelection objs = (StructuredSelection)tv.getSelection();
- if (objs != null){
- if (objs.getFirstElement() instanceof JSFLibrary){
- JSFLibrary lib = (JSFLibrary)objs.getFirstElement();
- JSFCorePlugin.getDefault().getJSFLibraryRegistry().setDefaultImplementation(lib);
- }
- JSFCorePlugin.getDefault().saveJSFLibraryRegistry();
- tv.refresh();
- }
- }
- }
- });
-
- }
- private Object getJSFLibraries() {
- return JSFCorePlugin.getDefault().getJSFLibraryRegistry().getAllJSFLibraries();
- }
-
- public void init(IWorkbench workbench) {
- wb = workbench;
- setDescription(Messages.JSFLibrariesPreferencePage_Description);
- noDefaultAndApplyButton();
- }
-
- /**
- * Getter created only for JUnit tests. Should not be used otherwise.
- * @return the TreeViewer of JSF Libraries
- */
- public Viewer getLibraryViewer(){
- return tv;
- }
-
- private class TreeViewerAdapter implements ITreeContentProvider, ISelectionChangedListener, IDoubleClickListener {
- private final Object[] NO_ELEMENTS= new Object[0];
-
- // ------- ITreeContentProvider Interface ------------
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // will never happen
- }
-
- public boolean isDeleted(Object element) {
- return false;
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object obj) {
- return ((List)getJSFLibraries()).toArray();
- }
-
- public Object[] getChildren(Object element) {
- if (element instanceof JSFLibrary) {
- return ((JSFLibrary)element).getArchiveFiles().toArray();
- }
- return NO_ELEMENTS;
- }
-
- public Object getParent(Object element) {
-// if (elements instanceof JSFLibrary) {
-// return tvAdapter.getParent(tv.getTree().class, element);
-// }
- return null;//fParentElement;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof JSFLibrary) {
- return true;
- }
- return false;
- }
-
- // ------- ISelectionChangedListener Interface ------------
-
- public void selectionChanged(SelectionChangedEvent event) {
- doListSelected(event);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
- */
- public void doubleClick(DoubleClickEvent event) {
- doDoubleClick(event);
- }
- }
-
- protected void doListSelected(SelectionChangedEvent event) {
- updateButtonState();
- }
-
- protected void doDoubleClick(DoubleClickEvent event) {
- openJSFLibraryEditDialog(tv.getTree().getSelection()[0]);
- }
-
- private void updateButtonState() {
- btnEdit.setEnabled(tv.getTree().getSelectionCount() == 1);
- if (tv.getTree().getSelectionCount() == 1 && tv.getTree().getSelection()[0].getData() instanceof JSFLibrary){
- btnDelete.setEnabled(true);
- btnMakeDefaultImpl.setVisible(false);
- JSFLibrary lib = (JSFLibrary)tv.getTree().getSelection()[0].getData();
- btnMakeDefaultImpl.setVisible(lib.isImplementation());
- } else {
- btnDelete.setEnabled(false);
- btnMakeDefaultImpl.setVisible(false);
- }
- }
-
- private void openJSFLibraryEditDialog(Object element) {
- if (isPluginProvidedJSFLibrary(element)){
- MessageDialog.openInformation(
- getShell(),
- Messages.JSFLibrariesPreferencePage_CannotModifyPluginProvidedTitle,
- Messages.JSFLibrariesPreferencePage_CannotModifyPluginProvidedMessage);
- return;
- }
- IWorkbenchWizard wizard = new JSFLibraryWizard();
- wizard.init(wb, getStructuredElement(element));
- WizardDialog dialog = new WizardDialog(wb.getActiveWorkbenchWindow().getShell(), wizard);
- int ret = dialog.open();
- if (ret == Window.OK){
- tv.refresh();
- }
- }
-
- private IStructuredSelection getStructuredElement(Object element) {
- if (element instanceof TreeItem){
- Object item = ((TreeItem)element).getData();
- if (item instanceof ArchiveFile){
- JSFLibrary parent = ((ArchiveFile)item).getJSFLibrary();
- return new StructuredSelection(parent);
- } else if (item instanceof JSFLibrary) {
- return new StructuredSelection(item);
- }
- }
- return null;
- }
-
- private boolean isPluginProvidedJSFLibrary(Object treeElement){
- if (treeElement instanceof TreeItem){
- Object item = ((TreeItem)treeElement).getData();
- if (item instanceof PluginProvidedJSFLibrary){
- return true;
- } else if (item instanceof ArchiveFile) {
- return (((ArchiveFile)item).getJSFLibrary() instanceof PluginProvidedJSFLibrary);
- }
- }
- return false;
- }
-
- private class TreeLabelProvider implements ILabelProvider {
- Image libImg;
- Image jarImg;
-
- TreeLabelProvider(){
- if (jarImg == null){
- ImageDescriptor jarImgDesc = JSFUiPlugin.getImageDescriptor("obj16/jar_obj.gif"); //$NON-NLS-1$
- jarImg = jarImgDesc.createImage();
- }
- if (libImg == null){
- ImageDescriptor libImgDesc = JSFUiPlugin.getImageDescriptor("obj16/library_obj.gif"); //$NON-NLS-1$
- libImg = libImgDesc.createImage();
- }
- }
-
- public Image getImage(Object element) {
- if (element instanceof JSFLibrary)
- return libImg;
- else
- return jarImg;
- }
-
- public String getText(Object element) {
- StringBuffer labelBuf = new StringBuffer();
- if (element instanceof JSFLibrary) {
- JSFLibrary lib = (JSFLibrary)element;
- labelBuf.append(lib.getName());
- if (lib.isImplementation()) {
- labelBuf.append(" [implementation"); //$NON-NLS-1$
- if (lib == JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation()) {
- labelBuf.append(" - default"); //$NON-NLS-1$
- }
- labelBuf.append("]"); //$NON-NLS-1$
- }
- }
- if (element instanceof ArchiveFile) {
- ArchiveFile jar = (ArchiveFile)element;
- labelBuf.append(jar.getName());
- if (!jar.exists())
- labelBuf.append("[missing]"); //$NON-NLS-1$
- labelBuf.append(" - ").append(((ArchiveFile)element).getSourceLocation()); //$NON-NLS-1$
- }
- return labelBuf.toString();
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public void dispose() {
- if (libImg != null){
- libImg.dispose();
- }
- if (jarImg != null){
- jarImg.dispose();
- }
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java
deleted file mode 100644
index 3ba48442f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryContainerWizardPage.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.classpath;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
-import org.eclipse.jst.jsf.ui.internal.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectNature;
-
-/**
- * Provides a classpath container wizard page for JSF Libraries.
- *
- * @author Gerry Kessler - Oracle
- */
-public class JSFLibraryContainerWizardPage extends WizardPage implements
- IClasspathContainerPage, IClasspathContainerPageExtension{
-
- private TableViewer lv;
- private JSFLibrariesTableViewerAdapter lvAdapter;
- private JSFLibrariesListLabelProvider lvLabelProvider;
- private ArrayList elements;
- private boolean isJSFProject = false;
-
- public JSFLibraryContainerWizardPage(){
- super(Messages.JSFLibraryContainerWizardPage_PageName);
- setTitle(Messages.JSFLibraryContainerWizardPage_Title);
- setDescription(Messages.JSFLibraryContainerWizardPage_Description);
- // TODO: Replace with a custom image.
- setImageDescriptor( JSFUiPlugin.getImageDescriptor("full/wizban/addlibrary_wiz.gif")); //$NON-NLS-1$
- }
-
- public void initialize(IJavaProject project, IClasspathEntry[] currentEntries) {
- isJSFProject = false;
- try {
- //check for faceted nature
- //NOTE: use of following constant produces warnings; this was known
- //but at time of writing no public API was available
- if (project.getProject().hasNature(FacetedProjectNature.NATURE_ID)){
- //check for jsf facet
- IFacetedProject fproj = ProjectFacetsManager.create(project.getProject());
- Iterator it = fproj.getProjectFacets().iterator();
- while (it.hasNext()){
- IProjectFacetVersion facetVersion = (IProjectFacetVersion)it.next();
- IProjectFacet facet = facetVersion.getProjectFacet();
- if (facet.getId().equals(JSFCorePlugin.FACET_ID)){
- isJSFProject = true;
- return;
- }
- }
- }
- } catch (CoreException e) {
- JSFUiPlugin.log(
- IStatus.ERROR,
- Messages.JSFLibraryContainerWizardPage_ErrorInitializing,
- e);
- }
- }
-
- public boolean finish() {
- // TODO Create lib containers and verify single implementation selected
- return true;
- }
-
- public boolean isPageComplete() {
- if (!isJSFProject) {
- return false;
- }
- return isValid();
- }
-
- private boolean isValid() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.IClasspathContainerPage#getSelection()
- */
- public IClasspathEntry getSelection() {
- if (lv.getSelection()!= null){
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.IClasspathContainerPage#setSelection(org.eclipse.jdt.core.IClasspathEntry)
- */
- public void setSelection(IClasspathEntry containerEntry) {
- }
-
- public void createControl(Composite parent) {
- //Build UI to display JSF Lib components from registry
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayout(new GridLayout(2, false));
- c.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- //disable wizard if this is not a valid JSF project
- if (!isJSFProject){
- Label warning = new Label(c , SWT.NONE);
- warning.setText(Messages.JSFLibraryContainerWizardPage_WarningNoJSFFacet);
- setControl(c);
- return;
- }
-
- Label lblViewer = new Label(c, SWT.NONE);
- lblViewer.setText(Messages.JSFLibraryContainerWizardPage_JSFLibraries);
- GridData gd1 = new GridData(GridData.BEGINNING);
- gd1.horizontalSpan = 2;
- lblViewer.setLayoutData(gd1);
-
- lv = createTableViewer(c);
- lv.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-
- lvAdapter = new JSFLibrariesTableViewerAdapter();
- lvLabelProvider = new JSFLibrariesListLabelProvider();
- lv.setContentProvider(lvAdapter);
- lv.setLabelProvider(lvLabelProvider);
- lv.addSelectionChangedListener(lvAdapter);
- lv.addDoubleClickListener(lvAdapter);
-
- lv.setInput(getJSFLibraries());
-
-// Composite btnBar = new Composite(c, SWT.NONE);
-// GridLayout gl = new GridLayout(1, false);
-// gl.marginHeight = 0;
-// gl.marginWidth = 0;
-
- Button addButton = new Button(c, SWT.NONE);
- addButton.setText(Messages.JSFLibraryContainerWizardPage_Add);
- addButton.setLayoutData(new GridData(GridData.END | GridData.VERTICAL_ALIGN_BEGINNING));
- addButton.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e){
- openJSFLibraryWizard(null);
- }
- });
-
- setControl(c);
- }
-
- private void openJSFLibraryWizard(Object element){
- IWorkbenchWizard wizard = new JSFLibraryWizard();
- IWorkbench wb = PlatformUI.getWorkbench();
- wizard.init(wb, getStructuredElement(element));
- WizardDialog dialog = new WizardDialog(wb.getActiveWorkbenchWindow().getShell(), wizard);
- int ret = dialog.open();
- if (ret == Window.OK){
- //FIXME: select returned object
- lv.refresh();
- }
- }
-
- private IStructuredSelection getStructuredElement(Object element) {
- if (element != null && element instanceof IStructuredSelection){
- //FIXME:
-// IStructuredSelection firstelement = (IStructuredSelection)((IStructuredSelection)element).getFirstElement();
-// return new StructuredSelection(firstelement);
- }
- return null;
- }
-
- private TableViewer createTableViewer(Composite parent) {
- Table table= new Table(parent, SWT.CHECK | SWT.BORDER | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
- table.setFont(parent.getFont());
- CheckboxTableViewer tableViewer= new CheckboxTableViewer(table);
- tableViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent e) {
- validate();
- }
- });
- return tableViewer;
- }
-
- private Object getJSFLibraries() {
- elements = new ArrayList(10);
- elements.addAll(JSFCorePlugin.getDefault().getJSFLibraryRegistry().getAllJSFLibraries());
- return elements;
- }
-
- private class JSFLibrariesTableViewerAdapter implements IStructuredContentProvider, ISelectionChangedListener, IDoubleClickListener {
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //should never happen
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- return elements.toArray();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- doListSelected(event);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
- */
- public void doubleClick(DoubleClickEvent event) {
- doDoubleClick(event);
- }
- }
-
- private class JSFLibrariesListLabelProvider implements ILabelProvider{
- Image libImg;
- public Image getImage(Object element) {
- if (libImg == null){
- ImageDescriptor libImgDesc = JSFUiPlugin.getImageDescriptor("obj16/library_obj.gif"); //$NON-NLS-1$
- libImg = libImgDesc.createImage();
- }
- return libImg;
- }
-
- public String getText(Object element) {
- if (element instanceof JSFLibrary) {
- JSFLibrary lib = (JSFLibrary)element;
- if (lib.isImplementation()) {
- return lib.getName() + " [implementation]"; //$NON-NLS-1$
- } else {
- return lib.getName();
- }
- }
- return null;
- }
-
- public void dispose() {
- if (libImg != null)
- libImg.dispose();
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
- }
-
- private void validate() {
- }
-
- private void doListSelected(SelectionChangedEvent event) {
- }
-
- private void doDoubleClick(DoubleClickEvent event) {
- openJSFLibraryWizard(lv.getSelection());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java
deleted file mode 100644
index 097043155..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/classpath/JSFLibraryWizard.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.classpath;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFVersion;
-import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
-import org.eclipse.jst.jsf.ui.internal.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * Dialog for creating or editing a JSF Library or Implementation.
- * <br>
- * If the selection passed in init is not null then the item will be edit mode.
- *
- * @author Gerry Kessler - Oracle
- */
-public class JSFLibraryWizard extends Wizard implements INewWizard {
- private Text txtName;
- private Label lblName;
- private CCombo cboVersions;
- private Label lblVersions;
- private Button chkDeploy;
- private Button chkImpl;
- private Composite btnBar;
- private Button btnAdd;
- private Button btnRemove;
- private TableViewer jars;
-
- private boolean isNew = false;
- private boolean modified = false;
- private boolean implsOnly = false;
-
- private JSFLibrary curLibrary;
- private JSFLibrary workingCopyLibrary;
-
- private JSFLibraryWizardPage page;
-
- private static final String DESCRIPTION = Messages.JSFLibraryWizard_DESCRIPTION;
- private static final String IMPLS_ONLY_DESC = Messages.JSFLibraryWizard_IMPLS_ONLY_DESC;
-
- private boolean nonimplOnly = false;
-
- public JSFLibraryWizard(boolean b) {
- super();
- implsOnly = b;
- }
-
- public JSFLibraryWizard() {
- super();
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- if (selection != null
- && selection.getFirstElement() instanceof JSFLibrary) {
- curLibrary = (JSFLibrary) selection.getFirstElement();
- workingCopyLibrary = curLibrary.getWorkingCopy();
- } else {
- isNew = true;
- workingCopyLibrary = JSFLibraryRegistryFactory.eINSTANCE.createJSFLibrary();
- }
- if (implsOnly) {
- setWindowTitle(Messages.JSFLibraryWizard_CreateImplementation);
- } else {
- setWindowTitle(isNew ? Messages.JSFLibraryWizard_CreateJSFLibrary : Messages.JSFLibraryWizard_EditJSFLibrary);
- }
- }
- public void init(IWorkbench workbench, IStructuredSelection selection, boolean nonimplonly) {
- init(workbench, selection);
- this.nonimplOnly = nonimplonly;
- }
- public boolean performFinish() {
- final String name = txtName.getText().trim();
- final boolean isDeployed = chkDeploy.getSelection();
- final boolean isImplementation = chkImpl.getSelection();
-
- workingCopyLibrary.setName(name);
- if (cboVersions.getSelectionIndex() >= 0) {
- JSFVersion ver = (JSFVersion) JSFVersion.VALUES.get(cboVersions
- .getSelectionIndex());
- workingCopyLibrary.setJSFVersion(ver);
- }
- workingCopyLibrary.setDeployed(isDeployed);
- workingCopyLibrary.setImplementation(isImplementation);
- if (isNew){
- JSFCorePlugin.getDefault().getJSFLibraryRegistry().addJSFLibrary(workingCopyLibrary);
- }
- else {
- curLibrary.updateValues(workingCopyLibrary);
- }
- JSFCorePlugin.getDefault().saveJSFLibraryRegistry();
- return true;
- }
-
- public void addPages() {
- page = new JSFLibraryWizardPage(Messages.JSFLibraryWizard_JSFLibrary);
- super.addPage(page);
- page.setWizard(this);
- }
-
- public JSFLibrary getJSFLibrary() {
- return workingCopyLibrary;
- }
-
- private class JSFLibraryWizardPage extends WizardPage implements
- ModifyListener, SelectionListener {
-
- private boolean initing;
-
- protected JSFLibraryWizardPage(String pageName) {
- super(pageName);
- setDescription(implsOnly ? IMPLS_ONLY_DESC : DESCRIPTION);
- setTitle(Messages.JSFLibraryWizard_JSFLibrary);
- }
-
- public boolean isPageComplete() {
- if (modified == false) {
- return false;
- }
- return super.isPageComplete();
- }
-
- public void createControl(Composite parent) {
- initing = true;
- initializeDialogUnits(parent);
-
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayout(new GridLayout(2, false));
- c.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- lblName = new Label(c, SWT.NONE);
- lblName.setText(Messages.JSFLibraryWizard_LibraryName);
- lblName.setLayoutData(new GridData(GridData.BEGINNING));
-
- txtName = new Text(c, SWT.BORDER);
- txtName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- txtName.addModifyListener(this);
-
- lblVersions = new Label(c, SWT.NONE);
- lblVersions.setText(Messages.JSFLibraryWizard_VersionSupported);
-
- cboVersions = new CCombo(c, SWT.SINGLE | SWT.READ_ONLY | SWT.BORDER);
- cboVersions.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- cboVersions.addModifyListener(this);
-
- Group jarsComp = new Group(c, SWT.NONE);
- jarsComp.setText(Messages.JSFLibraryWizard_LibraryJars);
- GridLayout gl1 = new GridLayout(2, false);
- jarsComp.setLayout(gl1);
- GridData gd2 = new GridData(GridData.FILL_HORIZONTAL
- | GridData.FILL_VERTICAL);
- gd2.horizontalSpan = 2;
- jarsComp.setLayoutData(gd2);
-
- createJarsViewer(jarsComp);
-
- createButtons(jarsComp);
-
- chkImpl = new Button(c, SWT.CHECK);
- chkImpl.setText(Messages.JSFLibraryWizard_IsJSFImplementation);
- GridData gd3 = new GridData();
- gd3.horizontalSpan = 2;
- chkImpl.setLayoutData(gd3);
- chkImpl.addSelectionListener(this);
-
- chkDeploy = new Button(c, SWT.CHECK);
- chkDeploy.setText(Messages.JSFLibraryWizard_DeployJars);
- GridData gd4 = new GridData();
- gd4.horizontalSpan = 2;
- chkDeploy.setLayoutData(gd4);
- chkDeploy.addSelectionListener(this);
- chkDeploy.setVisible(false);
-
- loadVersions();
-
- if (!isNew) {
- txtName.setText(workingCopyLibrary.getName());
- cboVersions.setText(workingCopyLibrary.getJSFVersion().getName());
- chkDeploy.setSelection(workingCopyLibrary.isDeployed());
- chkImpl.setSelection(workingCopyLibrary.isImplementation());
- }
-
- if (implsOnly) {
- chkImpl.setSelection(true);
- chkImpl.setEnabled(false);
- }
-
- if (nonimplOnly) {
- chkImpl.setSelection(false);
- chkImpl.setEnabled(false);
- }
- jars.setInput(workingCopyLibrary);
-
- initing = false;
- setControl(c);
-
- txtName.setFocus();
- setPageComplete(false);
- }
-
- private void createJarsViewer(Group jarsComp) {
- jars = new TableViewer(jarsComp, SWT.BORDER | SWT.MULTI);
- jars.setContentProvider(new IStructuredContentProvider() {
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof JSFLibrary)
- return ((JSFLibrary) inputElement).getArchiveFiles()
- .toArray();
- return new Object[0];
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput,
- Object newInput) {
- // won't happen
- }
- });
- jars.setLabelProvider(new ILabelProvider() {
- private Image jarImg = null;
- public Image getImage(Object element) {
- if (jarImg == null){
- ImageDescriptor desc = JSFUiPlugin.getImageDescriptor("obj16/jar_obj.gif"); //$NON-NLS-1$
- jarImg = desc.createImage();
- }
- return jarImg;
- }
-
- public String getText(Object element) {
- StringBuffer labelBuf = new StringBuffer();
- if (element instanceof ArchiveFile) {
- ArchiveFile archive = (ArchiveFile) element;
- labelBuf.append(archive.getName());
- if (!archive.exists())
- labelBuf.append("[missing]"); //$NON-NLS-1$
- labelBuf.append(" - ").append(archive.getPath()); //$NON-NLS-1$
- }
- return labelBuf.toString();
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public void dispose() {
- if (jarImg != null)
- jarImg.dispose();
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
- });
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = convertWidthInCharsToPixels(30);
- gd.heightHint = convertHeightInCharsToPixels(10);
- jars.getControl().setLayoutData(gd);
- }
-
- private void updateButtons() {
- btnRemove.setEnabled(jars.getSelection() != null);
- // getButton(IDialogConstants.OK_ID).setEnabled(modified);
- }
-
- private void createButtons(Composite c) {
- btnBar = new Composite(c, SWT.NONE);
- GridLayout gl = new GridLayout(1, false);
- gl.marginHeight = 0;
- gl.marginTop = 0;
- gl.marginWidth = 0;
- btnBar.setLayout(gl);
- btnBar.setLayoutData(new GridData(GridData.END));
-
- btnAdd = new Button(btnBar, SWT.NONE);
- btnAdd.setText(Messages.JSFLibraryWizard_Add);
- btnAdd.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- btnAdd.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- String cur = null;
- String[] chosenJars = openExtJarFileDialog(cur);
- if (chosenJars != null) {
- for (int i = 0; i < chosenJars.length; i++) {
- String jar = chosenJars[i];
- if (!workingCopyLibrary.containsArchiveFile(jar)) {
- ArchiveFile archive = JSFLibraryRegistryFactory.eINSTANCE
- .createArchiveFile();
- archive.setSourceLocation(jar);
- archive.setRelativeDestLocation("WEB-INF/lib"); //$NON-NLS-1$
- workingCopyLibrary.getArchiveFiles().add(archive);
- modified = true;
- }
- }
- jars.refresh();
- validate();
- }
- }
- });
-
- btnRemove = new Button(btnBar, SWT.NONE);
- btnRemove.setText(Messages.JSFLibraryWizard_Remove);
- btnRemove.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- btnRemove.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (jars.getSelection() instanceof StructuredSelection){
- StructuredSelection objs = (StructuredSelection)jars.getSelection();
- if (objs != null){
- Iterator it = objs.iterator();
- while (it.hasNext()){
- Object obj = it.next();
- ArchiveFile jar = (ArchiveFile)obj;
- workingCopyLibrary.getArchiveFiles().remove(jar);
- modified = true;
- }
- }
- jars.refresh();
- validate();
- }
- }
- });
- }
-
- private void loadVersions() {
- cboVersions.removeAll();
- Iterator it = JSFVersion.VALUES.iterator();
- while (it.hasNext()) {
- JSFVersion ver = (JSFVersion) it.next();
- cboVersions.add(ver.getName());
- }
- }
-
- private String[] openExtJarFileDialog(String existing) {
- String title = Messages.JSFLibraryWizard_ExtJarFileDialogTitle;
-
- FileDialog dialog = new FileDialog(getShell(),
- existing == null ? SWT.MULTI : SWT.SINGLE);
- dialog.setText(title);
- dialog.setFilterExtensions(new String[] { "*.jar;*.zip" }); //$NON-NLS-1$
- // FIXME: remember and use last path chosen??
- String filterPath = ResourcesPlugin.getWorkspace().getRoot()
- .getFullPath().toString();
- dialog.setFilterPath(filterPath);
- // if (existing != null) {
- // dialog.setFileName(existing.getPath().lastSegment());
- // }
-
- String res = dialog.open();
- if (res == null) {
- return null;
- }
- String[] fileNames = dialog.getFileNames();
- String[] elems = new String[fileNames.length];
- IPath file = new Path(res);
- IPath apath = file.removeLastSegments(1);
- for (int i = 0; i < fileNames.length; i++) {
- elems[i] = apath.append(fileNames[i]).toString();
- }
- return elems;
- }
-
- public void modifyText(ModifyEvent e) {
- modified = true;
- validate();
- updateButtons();
- }
-
- public void widgetSelected(SelectionEvent e) {
- modified = true;
- validate();
- updateButtons();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- private void validate() {
- if (initing)
- return;
- setErrorMessage(null);
- setPageComplete(true);
- if (!validateName() || !validateJars() || !validateVersion()) {
- setPageComplete(false);
- }
- }
-
- private boolean validateJars() {
- if (getJSFLibrary().getArchiveFiles().isEmpty()) {
- setErrorMessage(Messages.JSFLibraryWizard_ValidateNoJars);
- return false;
- }
- return true;
- }
-
- private boolean validateVersion() {
- //FIXME: why isn't selection indesx correct???
-// if (cboVersions.getSelectionIndex() < 0) {
-// setErrorMessage("Choose the maximum JSF version supported if known.");
-// return false;
-// }
- return true;
- }
-
- private boolean validateName() {
- if (txtName.getText() == null
- || txtName.getText().trim().equals("")) { //$NON-NLS-1$
- setErrorMessage(Messages.JSFLibraryWizard_ValidateNoLibraryName);
- return false;
- }
- String aName = txtName.getText().trim();
- if (isNew || (!isNew && !curLibrary.getName().equals(aName))) {
- if (isNameInRegistry(JSFCorePlugin.getDefault()
- .getJSFLibraryRegistry().getAllJSFLibraries(), aName)) {
- setErrorMessage(Messages.JSFLibraryWizard_ValidateExistingLibraryName);
- return false;
- }
- }
- return true;
- }
-
- private boolean isNameInRegistry(Collection c, String name) {
- Iterator it = c.iterator();
- while (it.hasNext()) {
- JSFLibrary lib = (JSFLibrary) it.next();
- if (lib.getName().equals(name)) {
- return true;
- }
- }
- return false;
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/IJSFImplLibraryCreationListener.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/IJSFImplLibraryCreationListener.java
deleted file mode 100644
index 85fc288f5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/IJSFImplLibraryCreationListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.jsflibraryconfig;
-
-/**
- * Listener interface when a new JSF implementation library is created.
- *
- * @author Justin Chen - Oracle
- *
- */
-public interface IJSFImplLibraryCreationListener extends java.util.EventListener {
- /**
- * Ok button is pressed in JSF Library dialog.
- *
- * @param event
- */
- public void okClicked(JSFImplLibraryCreationEvent event);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java
deleted file mode 100644
index d5774bef0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFImplLibraryCreationEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.jsflibraryconfig;
-
-import java.util.EventObject;
-
-/**
- * JSF Implementation library creation event.
- *
- * @author Justin Chen - Oracle
- *
- */
-public class JSFImplLibraryCreationEvent extends EventObject {
-
- private static final long serialVersionUID = 6390319185522362453L;
- private boolean isLibCreated;
-
- public JSFImplLibraryCreationEvent(Object source, boolean okClicked) {
- super(source);
- this.isLibCreated = okClicked;
- }
-
- /**
- * Ok button pressed.
- *
- * @return boolean
- */
- public boolean isLibraryCreated() {
- return isLibCreated;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java
deleted file mode 100644
index 6a4df664a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryConfigControl.java
+++ /dev/null
@@ -1,720 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.jsflibraryconfig;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryConfigModelAdapter;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryDecorator;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
-import org.eclipse.jst.jsf.ui.internal.Messages;
-import org.eclipse.jst.jsf.ui.internal.classpath.JSFLibraryWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A custom control used in wizard and property pages.
- *
- * @author Justin Chen - Oracle
- *
- */
-public class JSFLibraryConfigControl extends Composite implements IResourceChangeListener {
- final private int COLUMN_DEPLOY = 0;
- final private int COLUMN_LIB_NAME = 1;
-
- private JSFLibraryConfigModelAdapter provider = null;
-
- private ComboViewer cvImplLib;
- private CheckboxTableViewer ctvSelCompLib;
- private Button btnDeployJars;
- private TreeViewer tvCompLib;
- private TreeViewerAdapter tvAdapter;
- private TreeLabelProvider tvLabelProvider;
- private List colJSFImpl = null;
- private List colJSFComp = null;
- private Combo comboImplLib;
-
- private Vector newJSFLibCreatedListeners = new Vector();
-
- public void addOkClickedListener(IJSFImplLibraryCreationListener listener) {
- newJSFLibCreatedListeners.addElement(listener);
- }
- public void removeOkClickedListener(IJSFImplLibraryCreationListener listener) {
- newJSFLibCreatedListeners.removeElement(listener);
- }
-
- /**
- * Create the composite
- * @param parent
- * @param style
- * @param IProject
- */
- public JSFLibraryConfigControl(Composite parent, int style, IProject fProject) {
- super(parent, style);
-
- this.provider = new JSFLibraryConfigModelAdapter(fProject);
- this.colJSFImpl = provider.getProjectJSFImplementationLibraries();
- this.colJSFComp = provider.getProjectJSFComponentLibraries();
-
- initControls();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Widget#dispose()
- */
- public void dispose() {
- super.dispose();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Composite#checkSubclass()
- */
- protected void checkSubclass() {
- }
-
- /**
- * Return current selected JSF Implementation Library.
- * Otherwise, return null.
- *
- * @return JSFLibraryDecorator
- */
- public JSFLibraryDecorator getSelectedJSFLibImplementation() {
-
- JSFLibraryDecorator selJSFImpl = null;
- StructuredSelection objs = (StructuredSelection)cvImplLib.getSelection();
- if (objs != null){
- if (objs.getFirstElement() instanceof JSFLibraryDecorator){
- selJSFImpl = (JSFLibraryDecorator)objs.getFirstElement();
- selJSFImpl.setDeployment(btnDeployJars.getSelection());
- }
- }
- return selJSFImpl;
-
- }
-
- /**
- * Return a list of selected JSF Component Libraries.
- * Otherwise, return an empty list.
- *
- * @return a list of selected JSF Component Libraries
- */
- public List getSelectedJSFLibComponents() {
-
- List list = new ArrayList(Collections.EMPTY_LIST);
-
- Iterator it = ((List)ctvSelCompLib.getInput()).iterator();
- JSFLibraryDecorator prjJSFLib;
- while(it.hasNext()) {
- prjJSFLib = (JSFLibraryDecorator)it.next();
- prjJSFLib.setDeployment(false);
- if (prjJSFLib.isSelected()) {
- Object[] checked4Deploy = ctvSelCompLib.getCheckedElements();
- for (int i = 0; i < checked4Deploy.length; i++) {
- boolean toDeploy = ((JSFLibraryDecorator)checked4Deploy[i]).getID().equals(prjJSFLib.getID());
- if (toDeploy) {
- prjJSFLib.setDeployment(true);
- break;
- }
- }
- list.add(prjJSFLib);
- }
- }
- return list;
-
- }
-
- private void initializeControlValues() {
-
- cvImplLib.setInput(colJSFImpl);
-
- btnDeployJars.setSelection(false);
- if ( provider.getSelectedJSFImplementation() != null ) {
- JSFLibraryDecorator selJSFImplLib = provider.getSelectedJSFImplementation();
- cvImplLib.setSelection(new StructuredSelection(selJSFImplLib), true);
- btnDeployJars.setSelection(selJSFImplLib.checkForDeploy());
- } else {
- List implLibs = provider.getProjectJSFImplementationLibraries();
- if (implLibs.size() > 0) {
- // Might be to find the default if multiple implementation libraries available
- cvImplLib.setSelection(new StructuredSelection(implLibs.get(0)), true);
- ((JSFLibraryDecorator)implLibs.get(0)).setSelected(true);
- }
- }
-
- tvCompLib.setInput(colJSFComp);
-
- ctvSelCompLib.setInput(colJSFComp);
- JSFLibraryDecorator prjJSFLib = null;
- List jsfCompLib = provider.getSelectedJSFComponent();
- for (int i = 0; i < jsfCompLib.size(); i++) {
- prjJSFLib = (JSFLibraryDecorator)jsfCompLib.get(i);
- ctvSelCompLib.setChecked(prjJSFLib, prjJSFLib.checkForDeploy());
- }
- }
-
- private void loadJSFImplList() {
- cvImplLib.setInput(colJSFImpl);
- }
-
- private void loadJSFCompList() {
- ctvSelCompLib.setInput(this.colJSFComp);
- tvCompLib.setInput(this.colJSFComp);
- }
-
- private void initControls() {
-
- setRedraw(true);
- final GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 4;
- gridLayout.marginLeft = 0;
- gridLayout.marginRight = 0;
- gridLayout.marginWidth = 0;
- setLayout(gridLayout);
-
- final Label lblImplLib = new Label(this, SWT.NONE);
- final GridData gd_lbl_impl = new GridData(GridData.BEGINNING, GridData.CENTER, false, false, 2, 1);
- lblImplLib.setLayoutData(gd_lbl_impl);
- lblImplLib.setText(Messages.JSFLibraryConfigControl_ImplementationLibrary);
-
- btnDeployJars = new Button(this, SWT.CHECK);
- btnDeployJars.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false, 2, 1));
- btnDeployJars.setText(Messages.JSFLibraryConfigControl_DeployJAR);
-
- final Composite compTest = new Composite(this, SWT.None);
- final GridLayout compgl = new GridLayout();
- compgl.numColumns = 2;
- compgl.marginLeft = 0;
- compgl.marginRight = 0;
- compgl.marginWidth = 0;
- GridData gdCompTest = new GridData(SWT.FILL, SWT.FILL, true, false);
- gdCompTest.horizontalSpan = 4;
- compTest.setLayoutData(gdCompTest);
- compTest.setLayout(compgl);
-
- cvImplLib = new ComboViewer(compTest, SWT.READ_ONLY);
- cvImplLib.setLabelProvider(new ImplLibCVListLabelProvider());
- cvImplLib.setContentProvider(new ImplLibCVContentProvider());
- comboImplLib = cvImplLib.getCombo();
- final GridData gd_cvImplLib = new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1);
- comboImplLib.setLayoutData(gd_cvImplLib);
-
- final Button btnNewImpl = new Button(compTest, SWT.NONE);
- btnNewImpl.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
- btnNewImpl.setText(Messages.JSFLibraryConfigControl_NewImplementationLibrary);
- btnNewImpl.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- JSFLibraryWizard wizard = new JSFLibraryWizard(true);
- IWorkbench wb = PlatformUI.getWorkbench();
- wizard.init(wb, null);
- WizardDialog dialog = new WizardDialog(wb
- .getActiveWorkbenchWindow().getShell(), wizard);
- int ret = dialog.open();
- if (ret == Window.OK) {
- JSFLibraryDecorator newPrjJSFLib = new JSFLibraryDecorator(wizard.getJSFLibrary(), true, true);
- provider.getJSFLibraryRegistry().addJSFLibrary(wizard.getJSFLibrary());
-
- ((List)cvImplLib.getInput()).add(newPrjJSFLib);
- loadJSFImplList();
- btnDeployJars.setSelection(true);
- cvImplLib.setSelection(new StructuredSelection(newPrjJSFLib), true);
- }
- // Send event to listeners
- JSFImplLibraryCreationEvent event = new JSFImplLibraryCreationEvent(this, (ret == Window.OK));
- int size = newJSFLibCreatedListeners.size();
- for (int i = 0; i < size; i++) {
- IJSFImplLibraryCreationListener listener =
- (IJSFImplLibraryCreationListener) newJSFLibCreatedListeners.elementAt(i);
- listener.okClicked(event);
- }
- }
- });
-
- final Label lblSeparator = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd_lbl_spacer = new GridData(GridData.FILL, GridData.CENTER, true, false, 4, 1);
- lblSeparator.setLayoutData(gd_lbl_spacer);
- lblSeparator.setAlignment(SWT.CENTER);
-
- final Label lblCompLib = new Label(this, SWT.NONE);
- final GridData gd_lbl_complib = new GridData(GridData.FILL, GridData.CENTER, false, false, 4, 1);
- lblCompLib.setLayoutData(gd_lbl_complib);
- lblCompLib.setText(Messages.JSFLibraryConfigControl_ComponentLibrary);
-
- tvCompLib = new TreeViewer(this, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- tvAdapter = new TreeViewerAdapter();
- tvLabelProvider = new TreeLabelProvider();
- tvCompLib.setContentProvider(tvAdapter);
- tvCompLib.setLabelProvider(tvLabelProvider);
- tvCompLib.addSelectionChangedListener(tvAdapter);
- tvCompLib.addDoubleClickListener(tvAdapter);
- tvCompLib.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
- tvCompLib.addFilter(new TreeViewerFilter());
-
- final Composite composite_buttons = new Composite(this, SWT.NONE);
- composite_buttons.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- composite_buttons.setLayout(new GridLayout());
-
- final Composite composite_Single = new Composite(composite_buttons, SWT.None);
- composite_Single.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- final GridLayout gl_Single = new GridLayout();
- gl_Single.marginHeight = 4;
- composite_Single.setLayout(gl_Single);
-
- final Button btnAdd = new Button(composite_Single, SWT.NONE);
- btnAdd.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
- btnAdd.setText(Messages.JSFLibraryConfigControl_Add);
-
- final Button btnRemove = new Button(composite_Single, SWT.NONE);
- btnRemove.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
- btnRemove.setText(Messages.JSFLibraryConfigControl_Remove);
-
- final Composite composite_All = new Composite(composite_buttons, SWT.None);
- composite_All.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- final GridLayout gl_All = new GridLayout();
- gl_Single.marginHeight = 4;
- composite_All.setLayout(gl_All);
-
- final Button btnAddAll = new Button(composite_All, SWT.NONE);
- btnAddAll.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
- btnAddAll.setText(Messages.JSFLibraryConfigControl_AddAll);
-
- final Button btnRemoveAll = new Button(composite_All, SWT.NONE);
- btnRemoveAll.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
- btnRemoveAll.setText(Messages.JSFLibraryConfigControl_RemoveAll);
-
- final Composite composite_New = new Composite(composite_buttons, SWT.None);
- composite_New.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- final GridLayout gl_New = new GridLayout();
- gl_Single.marginHeight = 4;
- composite_New.setLayout(gl_New);
-
- final Button btnNewCompLib = new Button(composite_New, SWT.NONE);
- btnNewCompLib.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, false));
- btnNewCompLib.setText(Messages.JSFLibraryConfigControl_NewComponentLibrary);
- btnNewCompLib.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- JSFLibraryWizard wizard = new JSFLibraryWizard(false);
- IWorkbench wb = PlatformUI.getWorkbench();
- wizard.init(wb, null, true);
- WizardDialog dialog = new WizardDialog(wb
- .getActiveWorkbenchWindow().getShell(), wizard);
- int ret = dialog.open();
- if (ret == Window.OK) {
- JSFLibrary newCompLib = wizard.getJSFLibrary();
- JSFLibraryDecorator newPrjJSFLib = new JSFLibraryDecorator(newCompLib, true, newCompLib.isDeployed());
- provider.getJSFLibraryRegistry().addJSFLibrary(newCompLib);
-
- ((List)ctvSelCompLib.getInput()).add(newPrjJSFLib);
- loadJSFCompList();
- ctvSelCompLib.setChecked(newPrjJSFLib, true);
- }
- }
- });
-
- ctvSelCompLib = CheckboxTableViewer.newCheckList(this, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
- ctvSelCompLib.addFilter(new CheckedTableViewerFilter());
- final Table table = ctvSelCompLib.getTable();
- table.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
- table.setHeaderVisible(true);
- final TableColumn tcDeploy = new TableColumn(table, SWT.LEFT);
- tcDeploy.setWidth(50);
- tcDeploy.setText(Messages.JSFLibraryConfigControl_TH_Deploy);
- final TableColumn tcLibName = new TableColumn(table, SWT.LEFT);
- tcLibName.setWidth(150);
- tcLibName.setText(Messages.JSFLibraryConfigControl_TH_LibraryName);
-
- //ctvSelCompLib.setCellModifier(new CellModifierCTVSelCompLib());
- ctvSelCompLib.setSorter(new SelectedCompLibCTVSorter());
- ctvSelCompLib.setLabelProvider(new SelectedCompLibCTVLabelProvider());
- ctvSelCompLib.setContentProvider(new CompLibCTVContentProvider());
-
- initializeControlValues();
-
- btnAdd.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- StructuredSelection sel = (StructuredSelection)tvCompLib.getSelection();
- if (sel != null && sel.getFirstElement() != null) {
- if (sel.getFirstElement() instanceof JSFLibraryDecorator) {
- JSFLibraryDecorator prjJSFLib = (JSFLibraryDecorator)sel.getFirstElement();
- prjJSFLib.setSelected(true);
- prjJSFLib.setDeployment(true);
- tvCompLib.refresh();
- ctvSelCompLib.refresh();
- ctvSelCompLib.setChecked(prjJSFLib, true);
- }
- }
- }
- });
- btnAddAll.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- Iterator it = ((List)tvCompLib.getInput()).iterator();
- JSFLibraryDecorator prjJSFLib;
- while(it.hasNext()) {
- prjJSFLib = (JSFLibraryDecorator)it.next();
- prjJSFLib.setSelected(true);
- prjJSFLib.setDeployment(true);
- }
-
- tvCompLib.refresh();
- ctvSelCompLib.refresh();
- ctvSelCompLib.setAllChecked(true);
- }
- });
- btnRemove.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- StructuredSelection sel = (StructuredSelection)ctvSelCompLib.getSelection();
- if (sel != null && sel.getFirstElement() != null) {
- JSFLibraryDecorator prjJSFLib = (JSFLibraryDecorator)sel.getFirstElement();
- prjJSFLib.setDeployment(false);
- prjJSFLib.setSelected(false);
- tvCompLib.refresh();
- ctvSelCompLib.refresh();
- }
- }
- });
- btnRemoveAll.addMouseListener(new MouseAdapter() {
- public void mouseDown(MouseEvent e) {
- Iterator it = ((List)tvCompLib.getInput()).iterator();
- JSFLibraryDecorator prjJSFLib;
- while(it.hasNext()) {
- prjJSFLib = (JSFLibraryDecorator)it.next();
- prjJSFLib.setSelected(false);
- prjJSFLib.setDeployment(false);
- }
- tvCompLib.refresh();
- ctvSelCompLib.refresh();
- ctvSelCompLib.setAllChecked(false);
- }
- });
- }
-
- /**
- * Inner Classes for filtering.
- *
- */
- class CheckedTableViewerFilter extends ViewerFilter {
-
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof JSFLibraryDecorator) {
- return ((JSFLibraryDecorator)element).isSelected();
- }
- return false;
- }
- }
- class TreeViewerFilter extends ViewerFilter {
-
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (element instanceof JSFLibraryDecorator) {
- return !((JSFLibraryDecorator)element).isSelected();
- }
- return true;
- }
- }
-
- class CompLibCTVContentProvider implements IStructuredContentProvider {
- private List jsfImplLibs = new ArrayList(Collections.EMPTY_LIST);
-
- public Object[] getElements(Object inputElement) {
- return jsfImplLibs.toArray();
- }
- public void dispose() {
- }
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput == null) {
- jsfImplLibs = Collections.EMPTY_LIST;
- } else {
- //jsfImplLibs.clear();
- jsfImplLibs = (List)newInput;
- }
- }
- }
- class ImplLibCVContentProvider implements IStructuredContentProvider {
- private List jsfImplLibs = new ArrayList(Collections.EMPTY_LIST);
-
- public Object[] getElements(Object inputElement) {
- return jsfImplLibs.toArray();
- }
- public void dispose() {
- }
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput == null) {
- jsfImplLibs = Collections.EMPTY_LIST;
- } else {
- //jsfImplLibs.clear();
- //jsfImplLibs.addAll((java.util.List)newInput);
- jsfImplLibs = (List)newInput;
- }
- }
- }
-
- // Label Provider
- class SelectedCompLibCTVLabelProvider extends LabelProvider implements ITableLabelProvider {
- public String getColumnText(Object element, int columnIndex) {
- if (element instanceof JSFLibraryDecorator){
-
- switch(columnIndex) {
- case COLUMN_DEPLOY:
- return " "; //$NON-NLS-1$
- case COLUMN_LIB_NAME:
- //return ((JSFLibraryDecorator)element).getLibrary().getName();
- return ((JSFLibraryDecorator)element).getName();
- }
- }
- return ""; //$NON-NLS-1$
-
- }
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
- }
- class ImplLibCVListLabelProvider extends LabelProvider {
- private JSFLibrary defaultImpl = null;
-
- public String getText(Object element) {
- if (element instanceof JSFLibraryDecorator){
- //StringBuffer nameBuf = new StringBuffer(((JSFLibraryDecorator)element).getLibrary().getName());
- StringBuffer nameBuf = new StringBuffer(((JSFLibraryDecorator)element).getName());
- if ((((JSFLibraryDecorator)element).getLibrary()) == getDefaultImpl())
- nameBuf.append(" ").append(JSFLibraryRegistry.DEFAULT_IMPL_LABEL); //$NON-NLS-1$
- return nameBuf.toString() ;
- }
- return null;
- }
- private JSFLibrary getDefaultImpl() {
- if (defaultImpl == null){
- defaultImpl = provider.getJSFLibraryRegistry().getDefaultImplementation();
- }
- return defaultImpl;
- }
- public Image getImage(Object element) {
- return null;
- }
- }
-
- // Sorter
- class SelectedCompLibCTVSorter extends ViewerSorter {
- public int compare(Viewer viewer, Object e1, Object e2) {
- if (e1 instanceof JSFLibraryDecorator &&
- e2 instanceof JSFLibraryDecorator) {
- JSFLibraryDecorator item1 = (JSFLibraryDecorator)e1;
- JSFLibraryDecorator item2 = (JSFLibraryDecorator)e2;
- return item1.getName().compareToIgnoreCase(item2.getName());
- }
- return 0;
- }
- }
-
-
- /**
- * Borrowed from preference page with changes.
- */
- private class TreeViewerAdapter implements ITreeContentProvider, ISelectionChangedListener, IDoubleClickListener {
- private final Object[] NO_ELEMENTS= new Object[0];
-
- // ------- ITreeContentProvider Interface ------------
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // will never happen
- }
-
- public boolean isDeleted(Object element) {
- return false;
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object obj) {
- return provider.getProjectJSFComponentLibraries().toArray();
- }
-
- public Object[] getChildren(Object element) {
- if (element instanceof JSFLibraryDecorator) {
- return ((JSFLibraryDecorator)element).getArchiveFiles().toArray();
- }
- return NO_ELEMENTS;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof JSFLibraryDecorator) {
- return true;
- }
- return false;
- }
-
- // ------- ISelectionChangedListener Interface ------------
-
- public void selectionChanged(SelectionChangedEvent event) {
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
- */
- public void doubleClick(DoubleClickEvent event) {
-
- }
- }
-
- private class TreeLabelProvider implements ILabelProvider {
- Image libImg;
- Image jarImg;
-
- TreeLabelProvider(){
- if (jarImg == null){
- ImageDescriptor jarImgDesc = JSFUiPlugin.getImageDescriptor("obj16/jar_obj.gif"); //$NON-NLS-1$
- jarImg = jarImgDesc.createImage();
- }
- if (libImg == null){
- ImageDescriptor libImgDesc = JSFUiPlugin.getImageDescriptor("obj16/library_obj.gif"); //$NON-NLS-1$
- libImg = libImgDesc.createImage();
- }
- }
-
- public Image getImage(Object element) {
- if (element instanceof JSFLibraryDecorator)
- return libImg;
- else
- return jarImg;
- }
-
- public String getText(Object element) {
- StringBuffer labelBuf = new StringBuffer();
- if (element instanceof JSFLibraryDecorator) {
- JSFLibraryDecorator libWrapper = (JSFLibraryDecorator)element;
- JSFLibrary lib = (JSFLibrary)libWrapper.getLibrary();
- labelBuf.append(lib.getName());
- if (lib.isImplementation()) {
- labelBuf.append(" [implementation"); //$NON-NLS-1$
- if (lib == JSFCorePlugin.getDefault().getJSFLibraryRegistry().getDefaultImplementation()) {
- labelBuf.append(" - default"); //$NON-NLS-1$
- }
- labelBuf.append("]"); //$NON-NLS-1$
- }
- }
- if (element instanceof ArchiveFile) {
- ArchiveFile jar = (ArchiveFile)element;
- labelBuf.append(jar.getName());
- if (!jar.exists())
- labelBuf.append("[missing]"); //$NON-NLS-1$
- labelBuf.append(" - ").append(((ArchiveFile)element).getSourceLocation()); //$NON-NLS-1$
- }
- return labelBuf.toString();
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public void dispose() {
- if (libImg != null){
- libImg.dispose();
- }
- if (jarImg != null){
- jarImg.dispose();
- }
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
- }
-
- /**
- * Need to listen to resource changes to resolve
- * changes from facet install and property page
- */
- public void resourceChanged(IResourceChangeEvent event) {
- IResource res = event.getResource();
- /* JC Test
- switch (event.getType()) {
- case IResourceChangeEvent.PRE_CLOSE:
- System.out.print("Project ");
- System.out.print(res.getFullPath());
- System.out.println(" is about to close.");
- break;
- case IResourceChangeEvent.PRE_DELETE:
- System.out.print("Project ");
- System.out.print(res.getFullPath());
- System.out.println(" is about to be deleted.");
- break;
- case IResourceChangeEvent.POST_CHANGE:
- System.out.println("Resources have changed.");
- IProject project = provider.getProject();
- this.provider = null;
- this.colJSFImpl = null;
- this.colJSFComp = null;
- this.provider = new JSFLibraryConfigModelAdapter(project);
- this.colJSFImpl = provider.getProjectJSFImplementationLibraries();
- this.colJSFComp = provider.getProjectJSFComponentLibraries();
- break;
- case IResourceChangeEvent.PRE_AUTO_BUILD:
- System.out.println("Auto build about to run.");
- break;
- case IResourceChangeEvent.POST_AUTO_BUILD:
- System.out.println("Auto build complete.");
- break;
- }
- */
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryPropertyPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryPropertyPage.java
deleted file mode 100644
index ad359cb40..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/jsflibraryconfig/JSFLibraryPropertyPage.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Justin Chen - development check in
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.jsflibraryconfig;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.J2EEModuleDependencyDelegate;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryConfigModelAdapter;
-import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryDecorator;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author Justin Chen - Oracle
- */
-public class JSFLibraryPropertyPage extends PropertyPage {
- private static String JSF_FACET_ID = "jst.jsf"; //$NON-NLS-1$
- private JSFLibraryConfigControl jsfLibCfgControl;
- private JSFLibraryConfigModelAdapter provider;
- private IProject project;
-
- /**
- * Constructor for SamplePropertyPage.
- */
- public JSFLibraryPropertyPage() {
- super();
- super.noDefaultAndApplyButton();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.dialogs.PropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)
- */
- public void setElement(IAdaptable element) {
- super.setElement(element);
- project= (IProject) element.getAdapter(IResource.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performOk()
- */
- public boolean performOk() {
-
- // Do nothing since because of invalid settings.
- if (!validatePage()) {
- return true;
- }
-
- // Otheriwse, update project dependencies.
- List colImplLibs = new ArrayList();
- colImplLibs.add(jsfLibCfgControl.getSelectedJSFLibImplementation());
- List colCompLibs = jsfLibCfgControl.getSelectedJSFLibComponents();
-
- // update model first
- provider.saveData(colImplLibs, colCompLibs);
-
- // Update dependencies.
- J2EEModuleDependencyDelegate modulesDep = new J2EEModuleDependencyDelegate(project);
- IProgressMonitor monitor = new NullProgressMonitor();
-
- JSFLibraryDecorator newImplLib = jsfLibCfgControl.getSelectedJSFLibImplementation();
- JSFLibraryDecorator preSelectedJSFImplLib = provider.getPreviousJSFImplementation();
- if (preSelectedJSFImplLib != null) {
- modulesDep.removeProjectDependency(preSelectedJSFImplLib.getLibrary(), monitor);
- modulesDep.addProjectDependency(newImplLib.getLibrary(), newImplLib.checkForDeploy(), monitor);
- } else {
- modulesDep.addProjectDependency(newImplLib.getLibrary(), newImplLib.checkForDeploy(), monitor);
- }
-
- List ComponentLibs = provider.getProjectJSFComponentLibraries();
- JSFLibraryDecorator prjJSFCompLib = null;
- JSFLibrary compLib = null;
- for (int i = 0; i < ComponentLibs.size(); i++) {
- prjJSFCompLib = (JSFLibraryDecorator) ComponentLibs.get(i);
- compLib = prjJSFCompLib.getLibrary();
- modulesDep.removeProjectDependency(compLib, monitor);
- }
- for (int i = 0; i < ComponentLibs.size(); i++) {
- prjJSFCompLib = (JSFLibraryDecorator) ComponentLibs.get(i);
- if (prjJSFCompLib.isSelected()) {
- modulesDep.addProjectDependency(prjJSFCompLib.getLibrary(), prjJSFCompLib.checkForDeploy(), monitor);
- }
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
- //if (isJSFFacetInstalled()) {
- return createForJSFProject(parent);
- //} else {
- // return createForNonJSFProject(parent);
- //}
- }
-
- private Control createForJSFProject(Composite parent) {
- if (provider == null) {
- provider = new JSFLibraryConfigModelAdapter(project);
- }
-
- //
- jsfLibCfgControl = new JSFLibraryConfigControl(parent, SWT.NULL, project);
-
- /** JC Test
- ResourcesPlugin.getWorkspace().addResourceChangeListener(jsfLibCfgControl,
- IResourceChangeEvent.PRE_CLOSE
- | IResourceChangeEvent.PRE_DELETE
- | IResourceChangeEvent.PRE_AUTO_BUILD
- | IResourceChangeEvent.POST_AUTO_BUILD
- | IResourceChangeEvent.POST_CHANGE);
- End of JC Test
- */
-
- jsfLibCfgControl.addOkClickedListener(new IJSFImplLibraryCreationListener() {
- public void okClicked(JSFImplLibraryCreationEvent event) {
- validatePage();
- /*setValid(jsfLibCfgControl.getSelectedJSFLibImplementation() != null &&
- isJSFFacetInstalled());
- */
- }
- });
-
- validatePage();
-
- return jsfLibCfgControl;
- }
-
- protected boolean validatePage() {
- if (!isJSFFacetInstalled() || jsfLibCfgControl.getSelectedJSFLibImplementation() == null) {
- if (!isJSFFacetInstalled()) {
- JSFLibraryPropertyPage.this.setErrorMessage("JSF Facet not installed.");
- }
- if (jsfLibCfgControl.getSelectedJSFLibImplementation() == null) {
- JSFLibraryPropertyPage.this.setErrorMessage("No JSF implementation library selected.");
- }
- return false;
- }/* else {
- this.setMessage("Configurations are valid.", IMessageProvider.INFORMATION);
- }*/
- return true;
- }
-
- private boolean isJSFFacetInstalled() {
- if (project == null) {
- return false;
- }
-
- try {
- IFacetedProject fProject = ProjectFacetsManager.create(project);
-
- Iterator it = ((IFacetedProject)fProject).getProjectFacets().iterator();
- IProjectFacetVersion fv = null;
- String facetId = null;
- while (it.hasNext()) {
- fv = ((IProjectFacetVersion)it.next());
- facetId = fv.getProjectFacet().getId();
- if (facetId.equals(JSF_FACET_ID)) {
- return true;
- }
- }
-
- } catch (CoreException e) {
-
- }
- return false;
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/messages.properties
deleted file mode 100644
index ef90567d7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/messages.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are 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:
-# Gerry Kessler - initial API and implementation
-# Ian Trimble - change key names for use with org.eclipse.osgi.util.NLS
-###############################################################################
-JSFFacetInstallPage_title=JSF Capabilities
-JSFFacetInstallPage_description=Add JSF capabilities to this Web Project
-JSFFacetInstallPage_JSFImplLabel=JSF &Implementation:
-JSFFacetInstallPage_Add1=A&dd...
-JSFFacetInstallPage_Add2=&Add...
-JSFFacetInstallPage_DeployJarsLabel=&Deploy jars to WEB-INF/lib
-JSFFacetInstallPage_JSFConfigLabel=JSF &Configuration File:
-JSFFacetInstallPage_JSFServletNameLabel=JSF &Servlet Name:
-JSFFacetInstallPage_JSFURLMappingLabel=&URL Mapping Patterns:
-JSFFacetInstallPage_JSFLibraryLabel0=JSF Libraries:
-JSFFacetInstallPage_PatternDialogTitle=Specify URL Pattern
-JSFFacetInstallPage_PatternDialogDesc=URL Pattern
-JSFFacetInstallPage_Remove=&Remove
-JSFFacetInstallPage_PatternEmptyMsg=Pattern must not be empty
-JSFFacetInstallPage_PatternSpecifiedMsg=Pattern is already specified
-JSFFacetInstallPage_ErrorNoWebAppDataModel=Unable to locate WebApp datamodel
-
-JSFLibrariesPreferencePage_DefinedJSFLibraries=Defined JSF Libraries:
-JSFLibrariesPreferencePage_New=New...
-JSFLibrariesPreferencePage_Edit=Edit...
-JSFLibrariesPreferencePage_Remove=Remove
-JSFLibrariesPreferencePage_CannotRemovePluginProvidedTitle=Cannot Remove
-JSFLibrariesPreferencePage_CannotRemovePluginProvidedMessage=Plugin provided libraries cannot be removed from the registry
-JSFLibrariesPreferencePage_MakeDefault=Make Default
-JSFLibrariesPreferencePage_Description=JSF Libraries contain jars with JSF components and tag libraries. Some JSF Libaries can be specially marked as implementations so that the WebApp can be executed.
-JSFLibrariesPreferencePage_CannotModifyPluginProvidedTitle=Cannot Modify
-JSFLibrariesPreferencePage_CannotModifyPluginProvidedMessage=Plugin provided libraries cannot be edited
-
-JSFLibraryContainerWizardPage_PageName=Add JSF Library
-JSFLibraryContainerWizardPage_Title=JSF Library
-JSFLibraryContainerWizardPage_Description=Select JavaServer Face Library to add to the classpath
-JSFLibraryContainerWizardPage_WarningNoJSFFacet=JavaServer Face Libraries can only be configured for Dynamic Web projects with the JSF facet installed.
-JSFLibraryContainerWizardPage_JSFLibraries=JSF Libaries:
-JSFLibraryContainerWizardPage_Add=Add...
-JSFLibraryContainerWizardPage_ErrorInitializing=Error during initialization
-
-JSFLibraryWizard_DESCRIPTION=Create a library of jars that make up a JSF component library.
-JSFLibraryWizard_IMPLS_ONLY_DESC=Create a library of jars that make up a JSF implementation library.
-JSFLibraryWizard_CreateImplementation=Create JSF Implementation Library
-JSFLibraryWizard_CreateJSFLibrary=Create JSF Library
-JSFLibraryWizard_EditJSFLibrary=Edit JSF Library
-JSFLibraryWizard_JSFLibrary=JSF Library
-JSFLibraryWizard_LibraryName=Library &Name:
-JSFLibraryWizard_VersionSupported=&Version Supported:
-JSFLibraryWizard_LibraryJars=Library &Jars
-JSFLibraryWizard_IsJSFImplementation=Is JSF &Implementation
-JSFLibraryWizard_DeployJars=&Deploy Jars
-JSFLibraryWizard_Add=&Add...
-JSFLibraryWizard_Remove=&Remove
-JSFLibraryWizard_ExtJarFileDialogTitle=Browse for Jars/Zips
-JSFLibraryWizard_ValidateNoJars=The library must contain at least one jar.
-JSFLibraryWizard_ValidateNoLibraryName=A library name must be supplied.
-JSFLibraryWizard_ValidateExistingLibraryName=A library or implementation by this name already exists.
-
-JSFLibraryConfigControl_ImplementationLibrary=Implementation Library
-JSFLibraryConfigControl_NewImplementationLibrary=New...
-JSFLibraryConfigControl_DeployJAR=Deploy jars to WEB-INF/lib
-JSFLibraryConfigControl_ComponentLibrary=Component Libraries
-JSFLibraryConfigControl_Add=\ \ >
-JSFLibraryConfigControl_Remove=\ \ <
-JSFLibraryConfigControl_AddAll=\ \ >>
-JSFLibraryConfigControl_RemoveAll=\ \ <<
-JSFLibraryConfigControl_NewComponentLibrary=New...
-JSFLibraryConfigControl_TH_Deploy=Deploy
-JSFLibraryConfigControl_TH_LibraryName=Library Name
-
-JSFValidationPreferencePage_ELPrefPanel_Title=Expression Language (EL) Validation
-JSFValidationPreferencePage_ELPrefPanel_BuildValidationCheckBoxTitle=Validate EL on Build/Run Validation
-JSFValidationPreferencePage_ELPrefPanel_IncrementalValidationCheckBoxTitle= Validate EL as you type (may be slow on some pages)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/project/facet/JSFFacetInstallPage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/project/facet/JSFFacetInstallPage.java
deleted file mode 100644
index cd4997b86..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/project/facet/JSFFacetInstallPage.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Gerry Kessler - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.ui.internal.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jface.dialogs.DialogSettings;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
-import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
-import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties;
-import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin;
-import org.eclipse.jst.jsf.ui.internal.Messages;
-import org.eclipse.jst.jsf.ui.internal.classpath.JSFLibraryWizard;
-import org.eclipse.jst.jsf.ui.internal.jsflibraryconfig.IJSFImplLibraryCreationListener;
-import org.eclipse.jst.jsf.ui.internal.jsflibraryconfig.JSFLibraryConfigControl;
-import org.eclipse.jst.jsf.ui.internal.jsflibraryconfig.JSFImplLibraryCreationEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IWizardContext;
-
-/**
- * JSF Facet installation wizard page.
- *
- * @author Gerry Kessler - Oracle
- */
-public class JSFFacetInstallPage extends DataModelWizardPage implements IJSFFacetInstallDataModelProperties, IFacetWizardPage {
- // UI
- private Label lblJSFImpl;
- //private ComboViewer cboJSFImplViewer;
- //private Button chkDeployImpl;
- //private Button btnAddJSFImpl;
- private Label lblJSFConfig;
- private Text txtJSFConfig;
- private Label lblJSFServletName;
- private Text txtJSFServletName;
- private Label lblJSFServletURLPatterns;
- private List lstJSFServletURLPatterns;
- private Button btnAddPattern;
- private Button btnRemovePattern;
-
- private IDialogSettings dialogSettings;
- private IDataModel webAppDataModel;
- private static final String SETTINGS_ROOT = JSFUiPlugin.PLUGIN_ID
- + ".jsfFacetInstall"; //$NON-NLS-1$
- private static final String SETTINGS_CONFIG = "configPath"; //$NON-NLS-1$
- private static final String SETTINGS_SERVLET = "servletName"; //$NON-NLS-1$
- private static final String SETTINGS_URL_MAPPINGS = "urlMappings"; //$NON-NLS-1$
- private static final String SETTINGS_URL_PATTERN = "pattern"; //$NON-NLS-1$
- private static final String SETTINGS_DEPLOY_IMPL = "deployImplementation"; //$NON-NLS-1$
-
- private JSFLibraryConfigControl jsfLibCfgComp = null;
- private String projectName = null;
- private Composite composite = null;
-
- /**
- * Zero argument constructor
- */
- public JSFFacetInstallPage() {
- //FIXME: following WebFacetInstallPage pattern which will be fixed at somepoint
- super(DataModelFactory.createDataModel(new AbstractDataModelProvider(){}), "jsf.facet.install.page"); //$NON-NLS-1$
- setTitle(Messages.JSFFacetInstallPage_title);
- setDescription(Messages.JSFFacetInstallPage_description);
- dialogSettings = JSFUiPlugin.getDefault().getDialogSettings();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- protected Composite createTopLevelComposite (final Composite parent) {
- initializeDialogUnits(parent);
- composite = new Composite(parent, SWT.NONE);
- final GridLayout jsfCompositeLayout = new GridLayout(3, false);
- jsfCompositeLayout.marginLeft = 0;
- composite.setLayout(jsfCompositeLayout);
-
- lblJSFImpl = new Label(composite, SWT.None);
- lblJSFImpl.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
- //lblJSFImpl.setText(Messages.JSFFacetInstallPage_JSFImplLabel);
- lblJSFImpl.setText(Messages.JSFFacetInstallPage_JSFLibraryLabel0);
-
- ((GridLayout)composite.getLayout()).marginLeft = 0;
- IProject project = getProjectHandle();
- jsfLibCfgComp = new JSFLibraryConfigControl(composite, SWT.NONE, project);
-
- // JC Test
- ResourcesPlugin.getWorkspace().addResourceChangeListener(jsfLibCfgComp,
- IResourceChangeEvent.PRE_CLOSE
- | IResourceChangeEvent.PRE_DELETE
- | IResourceChangeEvent.PRE_AUTO_BUILD
- | IResourceChangeEvent.POST_AUTO_BUILD
- | IResourceChangeEvent.POST_CHANGE);
- // End of JC Test
-
-
- jsfLibCfgComp.addOkClickedListener(new IJSFImplLibraryCreationListener() {
- public void okClicked(JSFImplLibraryCreationEvent event) {
- if (((JSFImplLibraryCreationEvent) event).isLibraryCreated()) {
- validatePage();
- }
- }
- });
-
- GridData gd_comp = new GridData(GridData.FILL, GridData.FILL, true, true);
- gd_comp.horizontalSpan = 2;
- ((GridLayout)jsfLibCfgComp.getLayout()).marginLeft = 0;
- jsfLibCfgComp.setLayoutData(gd_comp);
-
- lblJSFConfig = new Label(composite, SWT.NONE);
- lblJSFConfig.setText(Messages.JSFFacetInstallPage_JSFConfigLabel);
- lblJSFConfig.setLayoutData(new GridData(GridData.BEGINNING));
-
- txtJSFConfig = new Text(composite, SWT.BORDER);
- GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
- gd1.horizontalSpan = 2;
- txtJSFConfig.setLayoutData(gd1);
-
- lblJSFServletName = new Label(composite, SWT.NONE);
- lblJSFServletName.setText(Messages.JSFFacetInstallPage_JSFServletNameLabel);
- lblJSFServletName.setLayoutData(new GridData(GridData.BEGINNING));
-
- txtJSFServletName = new Text(composite, SWT.BORDER);
- GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
- gd2.horizontalSpan = 2;
- txtJSFServletName.setLayoutData(gd2);
-
- lblJSFServletURLPatterns = new Label(composite, SWT.NULL);
- lblJSFServletURLPatterns.setText(Messages.JSFFacetInstallPage_JSFURLMappingLabel);
- lblJSFServletURLPatterns.setLayoutData(new GridData(GridData.BEGINNING
- | GridData.VERTICAL_ALIGN_BEGINNING));
- lstJSFServletURLPatterns = new List(composite, SWT.BORDER);
- GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
- gd3.heightHint = convertHeightInCharsToPixels(5);
- lstJSFServletURLPatterns.setLayoutData(gd3);
- lstJSFServletURLPatterns.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- btnRemovePattern.setEnabled(lstJSFServletURLPatterns
- .getSelectionCount() > 0);
- }
- });
-
- Composite btnComposite = new Composite(composite, SWT.NONE);
- GridLayout gl = new GridLayout(1, false);
- // gl.marginBottom = 0;
- // gl.marginTop = 0;
- // gl.marginRight = 0;
- gl.marginLeft = 0;
- btnComposite.setLayout(gl);
- btnComposite.setLayoutData(new GridData(GridData.END
- | GridData.VERTICAL_ALIGN_FILL));
-
- btnAddPattern = new Button(btnComposite, SWT.NONE);
- btnAddPattern.setText(Messages.JSFFacetInstallPage_Add2);
- btnAddPattern.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- btnAddPattern.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- InputDialog dialog = new InputDialog(
- getShell(),
- Messages.JSFFacetInstallPage_PatternDialogTitle,
- Messages.JSFFacetInstallPage_PatternDialogDesc,
- null, new IInputValidator() {
-
- public String isValid(String newText) {
- return isValidPattern(newText);
- }
-
- });
- dialog.open();
- if (dialog.getReturnCode() == Window.OK) {
- addItemToList(dialog.getValue(), true);
- }
- }
- });
-
- btnRemovePattern = new Button(btnComposite, SWT.NONE);
- btnRemovePattern.setText(Messages.JSFFacetInstallPage_Remove);
- btnRemovePattern.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- btnRemovePattern.setEnabled(false);
- btnRemovePattern.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- removeItemFromList(lstJSFServletURLPatterns.getSelection());
- btnRemovePattern.setEnabled(false);
- }
- });
-
- addModificationListeners();
-
- //parent.pack(true); Resized to show all controls.
- this.getContainer().getShell().pack();
-
- return composite;
- }
-
- private void initializeValues() {
- IDialogSettings root = dialogSettings.getSection(SETTINGS_ROOT);
-
- String conf = null;
- if (root != null)
- conf = root.get(SETTINGS_CONFIG);
- if (conf == null || conf.equals("")) { //$NON-NLS-1$
- conf = (String)model.getDefaultProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH);
- }
- txtJSFConfig.setText(conf);
-
- String servletName = null;
- if (root != null)
- servletName = root.get(SETTINGS_SERVLET);
- if (servletName == null || servletName.equals("")) { //$NON-NLS-1$
- servletName = (String)model.getDefaultProperty(IJSFFacetInstallDataModelProperties.SERVLET_NAME);
- }
- txtJSFServletName.setText(servletName);
-
- loadURLMappingPatterns(root);
- }
-
- private void saveSettings() {
- DialogSettings root = new DialogSettings(SETTINGS_ROOT);
- dialogSettings.addSection(root);
-
- root.put(SETTINGS_DEPLOY_IMPL, String.valueOf(getDeployJSFImpl()));
- root.put(SETTINGS_CONFIG, getJSFConfig());
- root.put(SETTINGS_SERVLET, getJSFServletName());
- DialogSettings mappings = new DialogSettings(SETTINGS_URL_MAPPINGS);
- root.addSection(mappings);
- mappings.put(SETTINGS_URL_PATTERN, getJSFPatterns());
- }
-
- private boolean getDeployJSFImpl() {
- if (jsfLibCfgComp.getSelectedJSFLibImplementation() == null) {
- return false;
- }
- return jsfLibCfgComp.getSelectedJSFLibImplementation().checkForDeploy();
- }
-
- private String getJSFConfig() {
- return txtJSFConfig.getText().trim();
- }
-
- private String getJSFServletName() {
- return txtJSFServletName.getText().trim();
- }
-
- private String[] getJSFPatterns() {
- return lstJSFServletURLPatterns.getItems();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#setConfig(java.lang.Object)
- */
- public void setConfig(Object config) {
- model.removeListener(this);
- synchHelper.dispose();
-
- model = (IDataModel) config;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.project.facet.ui.IFacetWizardPage#transferStateToConfig()
- */
- public void transferStateToConfig() {
- saveSettings(); //convenient place for this. don't want to save if user cancelled.
- //do nothing else now. being handled by synchHelper
-// config.setProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION, getJSFImpl());
-// config.setStringProperty(IJSFFacetInstallDataModelProperties.CONFIG_PATH, getJSFConfig());
-// config.setStringProperty(IJSFFacetInstallDataModelProperties.SERVLET_NAME, getJSFServletName());
-// config.setProperty(IJSFFacetInstallDataModelProperties.SERVLET_URL_PATTERNS, getJSFPatterns());
-
- java.util.List implLibs = new ArrayList();
- implLibs.add(jsfLibCfgComp.getSelectedJSFLibImplementation());
- java.util.List compLibs = jsfLibCfgComp.getSelectedJSFLibComponents();
- model.setProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION_LIBRARIES, implLibs);
- model.setProperty(IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES, compLibs);
- }
-
- private void addModificationListeners() {
-// 119330 - enhancement request for ComboViewer support. Manually update model for now
-// addJSFImplComboListeners();
-// synchHelper.synchComboViewer(cboJSFImplViewer, IMPLEMENTATION, null);
- synchHelper.synchText(txtJSFConfig, CONFIG_PATH, null);
- synchHelper.synchText(txtJSFServletName, SERVLET_NAME, null);
-// synchHelper.synchCheckbox(chkDeployImpl, DEPLOY_IMPLEMENTATION, null);
-// Until 119321 is fixed, need to comment out below and handle model updates 'manually'.
-// This is being done on Add and Remove, currently
-// synchHelper.synchList(lstJSFServletURLPatterns, SERVLET_URL_PATTERNS, null);
- }
-/*
- private void addJSFImplComboListeners() {
- cboJSFImplViewer.addSelectionChangedListener(new ISelectionChangedListener(){
- public void selectionChanged(SelectionChangedEvent event) {
- if (cboJSFImplViewer.getSelection() != null && cboJSFImplViewer.getSelection() instanceof StructuredSelection){
- StructuredSelection sel = (StructuredSelection)cboJSFImplViewer.getSelection();
- if (sel.getFirstElement() != null){
- JSFLibrary lib = (JSFLibrary)sel.getFirstElement();
- model.setProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION, lib);
- return;
- }
- }
- model.setProperty(IJSFFacetInstallDataModelProperties.IMPLEMENTATION, null );
- }
- });
- }
-*/
- private String isValidPattern(String value) {
- if (value == null || value.trim().equals("")) //$NON-NLS-1$
- return Messages.JSFFacetInstallPage_PatternEmptyMsg;
- if (lstJSFServletURLPatterns.indexOf(value) >= 0)
- return Messages.JSFFacetInstallPage_PatternSpecifiedMsg;
-
- return null;
- }
-
- private void loadURLMappingPatterns(IDialogSettings root) {
- lstJSFServletURLPatterns.removeAll();
- IDialogSettings mappings = null;
- if (root != null)
- mappings = root.getSection(SETTINGS_URL_MAPPINGS);
- String[] patterns = null;
- if (mappings != null)
- patterns = mappings.getArray(SETTINGS_URL_PATTERN);
-
- if (patterns == null || patterns.length == 0) {
- patterns = (String[])model.getDefaultProperty(IJSFFacetInstallDataModelProperties.SERVLET_URL_PATTERNS);
- }
- for (int i = 0; i < patterns.length; i++) {
- addItemToList(patterns[i], false);
- }
- }
-
- private void addItemToList(String pattern, boolean selectMe) {
- lstJSFServletURLPatterns.add(pattern == null ? "" : pattern); //$NON-NLS-1$
- if (pattern == null && selectMe)
- lstJSFServletURLPatterns.setSelection(lstJSFServletURLPatterns
- .getItemCount() - 1);
-// When 119321 is fixed - remove code below
- updateModelForURLPattern();
- }
-
- private void removeItemFromList(String[] selection) {
- for (int i = 0; i < selection.length; i++) {
- String sel = selection[i];
- lstJSFServletURLPatterns.remove(sel);
- }
-// When 119321 is fixed - remove code below
- updateModelForURLPattern();
- }
-
- private void updateModelForURLPattern() {
- model.setProperty(IJSFFacetInstallDataModelProperties.SERVLET_URL_PATTERNS, lstJSFServletURLPatterns.getItems());
- }
-/*
- private void loadJSFImplList() {
- cboJSFImplViewer.setInput(JSFCorePlugin.getDefault().getJSFLibraryRegistry()
- .getImplJSFLibraries());
- }
-*/
- protected String[] getValidationPropertyNames() {
- return new String[]{IMPLEMENTATION, DEPLOY_IMPLEMENTATION, CONFIG_PATH, SERVLET_NAME};
- }
-
- public void setWizardContext(IWizardContext context) {
- projectName = context.getProjectName();
-
- //hook into web datamodel if new project wizard.
- Iterator it = context.getSelectedProjectFacets().iterator();
- IProjectFacetVersion webFacetVersion = null;
- while (it.hasNext()){
- //find Web facet
- IProjectFacetVersion pfv = (IProjectFacetVersion)it.next();
- if (pfv.getProjectFacet().getId().equals("jst.web")){ //$NON-NLS-1$
- webFacetVersion = pfv;
- break;
- }
- }
- if (webFacetVersion != null){
- try {
- webAppDataModel = (IDataModel)context.getConfig(webFacetVersion, IFacetedProject.Action.Type.INSTALL,
- context.getProjectName());
- if (webAppDataModel != null){
- webAppDataModel.addListener(this);
- }
- } catch (CoreException e) {
- JSFUiPlugin.log(
- IStatus.ERROR,
- Messages.JSFFacetInstallPage_ErrorNoWebAppDataModel,
- e);
- }
- }
- }
-
- public void propertyChanged(DataModelEvent event) {
- if (webAppDataModel != null){
- String propertyName = event.getPropertyName();
- if (propertyName.equals(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)){
- model.setStringProperty(WEBCONTENT_DIR, event.getProperty().toString());
- }
- }
- super.propertyChanged(event);
- }
-
- public void dispose() {
- if (webAppDataModel != null)
- webAppDataModel.removeListener(this);
- super.dispose();
- }
- protected void restoreDefaultSettings() {
- initializeValues();
- }
-
- private IProject getProjectHandle() {
- if (projectName != null) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/ELPrefPanel.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/ELPrefPanel.java
deleted file mode 100644
index 042bfafb9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/ELPrefPanel.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.ui.internal.validation;
-
-import org.eclipse.jst.jsf.ui.internal.Messages;
-import org.eclipse.jst.jsf.validation.internal.ELValidationPreferences;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * Creates and manages a panel for configuring
- *
- * @author cbateman
- */
-/*package*/ class ELPrefPanel
-{
- /* view */
- private final Group _container;
- private final Button _chkBuildValidation;
- private final Button _chkIncrementalValidation;
-
- /* model */
- private ELValidationPreferences _prefs;
-
- /**
- * Allocates new container in parent.
- * @param parent
- */
- public ELPrefPanel(Composite parent)
- {
- _container = new Group(parent, SWT.NONE);
- _container.setText(Messages.JSFValidationPreferencePage_ELPrefPanel_Title);
- _container.setLayout(new RowLayout(SWT.VERTICAL));
-
- _chkBuildValidation = new Button(_container, SWT.CHECK);
- _chkBuildValidation.setText(Messages.JSFValidationPreferencePage_ELPrefPanel_BuildValidationCheckBoxTitle);
- _chkBuildValidation.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- _prefs.setEnableBuildValidation(_chkBuildValidation.getSelection());
- refresh();
- }
- });
-
- _chkIncrementalValidation = new Button(_container, SWT.CHECK);
- _chkIncrementalValidation.setText(Messages.JSFValidationPreferencePage_ELPrefPanel_IncrementalValidationCheckBoxTitle);
- _chkIncrementalValidation.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- _prefs.setEnableIncrementalValidation(_chkIncrementalValidation.getSelection());
- refresh();
- }
- });
-
- }
-
- /**
- * @return the top-level container managed by this panel
- */
- public Control getControl()
- {
- return _container;
- }
-
- /**
- * Sets the model for panel
- *
- * @param prefs
- */
- public void setModel(ELValidationPreferences prefs)
- {
- _prefs = prefs;
- }
-
- /**
- * Refreshes the UI from the model
- */
- public void refresh()
- {
- _chkBuildValidation.setSelection(_prefs.isEnableBuildValidation());
- _chkIncrementalValidation.
- setSelection(_prefs.isEnableIncrementalValidation());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/JSFValidationPreferencePage.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/JSFValidationPreferencePage.java
deleted file mode 100644
index 90b22a14e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/validation/JSFValidationPreferencePage.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.ui.internal.validation;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.jsf.validation.internal.ValidationPreferences;
-import org.eclipse.jst.jsf.validation.internal.el.Activator;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Workbench preference page for configuring JSF validation
- *
- * @author cbateman
- *
- */
-public class JSFValidationPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage
-{
- private final ValidationPreferences _prefs;
-
- private ELPrefPanel _elPrefPanel;
-
- /**
- * Constructor
- */
- public JSFValidationPreferencePage()
- {
- super(/* TODO: title*/);
- _prefs = new ValidationPreferences();
- _prefs.load(getPreferenceStore());
- }
-
- protected Control createContents(Composite parent)
- {
- _elPrefPanel = new ELPrefPanel(parent);
- _elPrefPanel.setModel(_prefs.getElPrefs());
- _elPrefPanel.refresh();
- return _elPrefPanel.getControl();
- }
-
- public void init(IWorkbench workbench)
- {
- // do nothing
- }
-
- protected void performApply()
- {
- _prefs.commit(getPreferenceStore());
- }
-
- protected void performDefaults()
- {
- _prefs.setDefaults();
- _elPrefPanel.refresh();
- super.performDefaults();
- }
-
- public boolean performOk()
- {
- performApply();
- return true;
- }
-
- protected IPreferenceStore doGetPreferenceStore()
- {
- // load the validation pref store
- return Activator.getDefault().getPreferenceStore();
- }
-
-}

Back to the top