Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

summaryrefslogtreecommitdiffstats
path: root/org.eclipse.osee.ote.version.git.test/build.properties
blob: 34d2e4d2dad529ceaeb953bfcdb63c51d69ffed2 (plain) (blame) 
1
2
3
4

source.. = src/
output.. = bin/
bin.includes = META-INF/,\
               .

Back to the top

plateFeature/eclipse_update_120.jpg?h=v20070717'>jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html328
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties147
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.xml31
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html82
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html27
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini31
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.mappings6
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties27
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties3
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gifbin1706 -> 0 bytes-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.pngbin4634 -> 0 bytes-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties20
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore1
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project17
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties8
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpgbin21695 -> 0 bytes-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html328
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties144
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml31
-rw-r--r--jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html97
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore4
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.core.prefs77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/about.ini29
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/about.mappings6
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties27
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties52
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gifbin1706 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gifbin2701 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gifbin1562 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gifbin2683 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gifbin2778 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gifbin108 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gifbin5600 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gifbin138 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gifbin259 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gifbin2701 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gifbin182 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gifbin367 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gifbin163 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties16
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml6
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd213
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd213
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/ICommonConstants.java107
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java460
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java69
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java68
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java230
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/BooleanComboDialogField.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java68
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClasspathResourceButtonDialogField.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java337
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java125
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java337
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java103
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java534
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java106
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties48
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldWrapper.java345
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java175
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java238
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java248
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LocaleComboDialogField.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/MultiTypeButtonDialogField.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/NumberDialogField.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/PackageButtonDialogField.java254
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java219
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java219
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java340
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java190
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java109
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java172
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java267
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java375
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java110
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java381
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java251
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java354
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java835
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java375
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java142
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java104
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java328
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java335
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java1084
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java72
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java160
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java257
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JMTEntityResolver.java82
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java1004
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java260
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java213
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java576
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java282
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java157
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java1878
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java80
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java253
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java282
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.cvsignore3
-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.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs3
-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.MF55
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml276
-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.properties57
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml105
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java1541
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties449
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java275
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties85
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java179
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java1368
-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.java22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/ModelLoader.java215
-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.java63
-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.java497
-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.java270
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java230
-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.java123
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java399
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java433
-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.java181
-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.java286
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java383
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java43
-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.java198
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java763
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java233
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java46
-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.java185
-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.java374
-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.java1216
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java242
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java545
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties146
-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.java211
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java329
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/InternalImages.java101
-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/action/icons/alignbottom.gifbin928 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gifbin190 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gifbin924 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gifbin90 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gifbin919 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gifbin90 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gifbin929 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gifbin94 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gifbin923 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gifbin90 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gifbin931 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gifbin92 -> 0 bytes-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.java98
-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.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java39
-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.java252
-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.java47
-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.java190
-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.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java76
-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.java35
-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.java137
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java387
-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.java340
-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.java476
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java479
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java56
-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.java53
-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.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java307
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java377
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java550
-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.java290
-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.java308
-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.java157
-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.java367
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java11
-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.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java375
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java134
-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.java476
-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.properties22
-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.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java117
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java201
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java126
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java155
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java168
-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.java268
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java945
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java215
-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.java216
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java204
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java185
-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.java256
-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.java278
-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.java249
-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.java923
-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.java718
-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.java399
-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.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java169
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java463
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java184
-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.java570
-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.java138
-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.java288
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java216
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java505
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java403
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java472
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java320
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java451
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java169
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java58
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java363
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java156
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java630
-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.java318
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java354
-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.java695
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java315
-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.java116
-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.java501
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java531
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java399
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java400
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java775
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java529
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java180
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java113
-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.java322
-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.java229
-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.java199
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties128
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/.cvsignore4
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/.settings/org.eclipse.jdt.core.prefs77
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF29
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/build.properties24
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/FacesConfigPlugin.java115
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ActionListenerTypeItemProvider.java211
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationFactoryTypeItemProvider.java214
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationTypeItemProvider.java328
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/AttributeClassTypeItemProvider.java193
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/AttributeExtensionTypeItemProvider.java131
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/AttributeNameTypeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/AttributeTypeItemProvider.java330
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/BaseNameTypeItemProvider.java195
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentExtensionTypeItemProvider.java130
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentFamilyTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentTypeItemProvider.java311
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentTypeTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterForClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterIdTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterTypeItemProvider.java325
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultLocaleTypeItemProvider.java183
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultRenderKitIdTypeItemProvider.java203
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultValueTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DescriptionTypeItemProvider.java213
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DisplayNameTypeItemProvider.java213
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DocumentRootItemProvider.java389
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DynamicAttributeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DynamicElementItemProvider.java241
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ELResolverTypeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExtensionTypeItemProvider.java205
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesConfigEditPlugin.java103
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesConfigExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesConfigItemProviderAdapterFactory.java2396
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesConfigTypeItemProvider.java313
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesContextFactoryTypeItemProvider.java203
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetExtensionTypeItemProvider.java130
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetNameTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacetTypeItemProvider.java257
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FactoryExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FactoryTypeItemProvider.java247
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FromActionTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FromOutcomeTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FromViewIdTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/IconTypeItemProvider.java237
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/KeyClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/KeyTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LargeIconTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleFactoryTypeItemProvider.java206
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleTypeItemProvider.java211
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ListEntriesTypeItemProvider.java234
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/Literals.java3595
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LocaleConfigTypeItemProvider.java230
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ManagedBeanClassTypeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ManagedBeanExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ManagedBeanNameTypeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ManagedBeanScopeTypeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ManagedBeanTypeItemProvider.java346
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ManagedPropertyTypeItemProvider.java359
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MapEntriesTypeItemProvider.java238
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MapEntryTypeItemProvider.java265
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MessageBundleTypeItemProvider.java205
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationCaseTypeItemProvider.java322
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationHandlerTypeItemProvider.java203
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationRuleExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationRuleTypeItemProvider.java266
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NullValueTypeItemProvider.java169
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PhaseListenerTypeItemProvider.java206
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyExtensionTypeItemProvider.java130
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyNameTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyResolverTypeItemProvider.java206
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyTypeItemProvider.java347
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RedirectTypeItemProvider.java165
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ReferencedBeanClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ReferencedBeanNameTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ReferencedBeanTypeItemProvider.java265
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitFactoryTypeItemProvider.java206
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitIdTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitTypeItemProvider.java294
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RendererClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RendererExtensionTypeItemProvider.java130
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RendererTypeItemProvider.java331
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RendererTypeTypeItemProvider.java207
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ResourceBundleTypeItemProvider.java267
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/SmallIconTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/StateManagerTypeItemProvider.java205
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/SuggestedValueTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/SupportedLocaleTypeItemProvider.java183
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ToViewIdTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorExtensionTypeItemProvider.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorIdTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorTypeItemProvider.java301
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValueClassTypeItemProvider.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValueTypeItemProvider.java197
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VarTypeItemProvider.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VariableResolverTypeItemProvider.java205
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewHandlerTypeItemProvider.java205
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ActionListenerType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ApplicationExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ApplicationFactoryType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ApplicationType.java285
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/AttributeClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/AttributeExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/AttributeNameType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/AttributeType.java253
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/BaseNameType.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ComponentClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ComponentExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ComponentFamilyType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ComponentType.java251
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ComponentTypeType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ConverterClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ConverterExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ConverterForClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ConverterIdType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ConverterType.java261
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DefaultLocaleType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DefaultRenderKitIdType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DefaultValueType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DescriptionType.java123
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DisplayNameType.java123
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DocumentRoot.java2589
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DynamicAttribute.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/DynamicElement.java129
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ELResolverType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ExtensionType.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacesConfigExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacesConfigFactory.java913
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacesConfigPackage.java15004
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacesConfigType.java323
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacesContextFactoryType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacetExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacetNameType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FacetType.java169
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FactoryExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FactoryType.java159
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FromActionType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FromOutcomeType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/FromViewIdType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/IconType.java151
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/KeyClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/KeyType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/LargeIconType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/LifecycleExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/LifecycleFactoryType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/LifecycleType.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ListEntriesType.java133
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/LocaleConfigType.java115
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ManagedBeanClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ManagedBeanExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ManagedBeanNameType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ManagedBeanScopeType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ManagedBeanType.java299
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ManagedPropertyType.java291
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/MapEntriesType.java143
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/MapEntryType.java151
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/MessageBundleType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/NavigationCaseType.java235
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/NavigationHandlerType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/NavigationRuleExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/NavigationRuleType.java187
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/NullValueType.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/PhaseListenerType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/PropertyClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/PropertyExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/PropertyNameType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/PropertyResolverType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/PropertyType.java253
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RedirectType.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ReferencedBeanClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ReferencedBeanNameType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ReferencedBeanType.java179
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RenderKitClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RenderKitExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RenderKitFactoryType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RenderKitIdType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RenderKitType.java215
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RendererClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RendererExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RendererType.java261
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/RendererTypeType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ResourceBundleType.java177
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/SmallIconType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/StateManagerType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/SuggestedValueType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/SupportedLocaleType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ToViewIdType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ValidatorClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ValidatorExtensionType.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ValidatorIdType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ValidatorType.java233
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ValueClassType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ValueType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/VarType.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/VariableResolverType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/ViewHandlerType.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ActionListenerTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ApplicationExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ApplicationFactoryTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ApplicationTypeImpl.java628
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/AttributeClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/AttributeExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/AttributeNameTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/AttributeTypeImpl.java605
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/BaseNameTypeImpl.java227
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ComponentClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ComponentExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ComponentFamilyTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ComponentTypeImpl.java582
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ComponentTypeTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ConverterClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ConverterExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ConverterForClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ConverterIdTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ConverterTypeImpl.java612
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DefaultLocaleTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DefaultRenderKitIdTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DefaultValueTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DescriptionTypeImpl.java279
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DisplayNameTypeImpl.java279
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DocumentRootImpl.java3526
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DynamicAttributeImpl.java227
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/DynamicElementImpl.java314
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ELResolverTypeImpl.java227
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ExtensionTypeImpl.java268
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacesConfigExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacesConfigFactoryImpl.java1155
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacesConfigPackageImpl.java9837
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacesConfigTypeImpl.java683
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacesContextFactoryTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacetExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacetNameTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FacetTypeImpl.java404
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FactoryExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FactoryTypeImpl.java373
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FromActionTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FromOutcomeTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/FromViewIdTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/IconTypeImpl.java372
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/KeyClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/KeyTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/LargeIconTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/LifecycleExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/LifecycleFactoryTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/LifecycleTypeImpl.java263
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ListEntriesTypeImpl.java330
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/LocaleConfigTypeImpl.java293
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ManagedBeanClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ManagedBeanExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ManagedBeanNameTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ManagedBeanScopeTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ManagedBeanTypeImpl.java709
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ManagedPropertyTypeImpl.java702
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/MapEntriesTypeImpl.java360
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/MapEntryTypeImpl.java385
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/MessageBundleTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/NavigationCaseTypeImpl.java568
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/NavigationHandlerTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/NavigationRuleExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/NavigationRuleTypeImpl.java441
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/NullValueTypeImpl.java171
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/PhaseListenerTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/PropertyClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/PropertyExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/PropertyNameTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/PropertyResolverTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/PropertyTypeImpl.java605
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RedirectTypeImpl.java171
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ReferencedBeanClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ReferencedBeanNameTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ReferencedBeanTypeImpl.java434
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RenderKitClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RenderKitExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RenderKitFactoryTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RenderKitIdTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RenderKitTypeImpl.java508
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RendererClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RendererExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RendererTypeImpl.java612
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/RendererTypeTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ResourceBundleTypeImpl.java426
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/SmallIconTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/StateManagerTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/SuggestedValueTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/SupportedLocaleTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ToViewIdTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ValidatorClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ValidatorExtensionTypeImpl.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ValidatorIdTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ValidatorTypeImpl.java545
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ValueClassTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ValueTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/VarTypeImpl.java227
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/VariableResolverTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/impl/ViewHandlerTypeImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/util/FacesConfigAdapterFactory.java1764
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/emf/util/FacesConfigSwitch.java2170
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/Logger.java229
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/nls/Messages.java369
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/nls/messages.properties369
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ActionListenerTranslator.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ApplicationExtensionTranslator.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ApplicationFactoryTranslator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ApplicationTranslator.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/AttributeClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/AttributeExtensionTranslator.java24
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/AttributeNameTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/AttributeTranslator.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/BaseNameTranslator.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ComponentClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ComponentExtensionTranslator.java24
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ComponentFamilyTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ComponentTranslator.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ComponentTypeTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ConverterClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ConverterExtensionTranslator.java22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ConverterForClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ConverterIdTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ConverterTranslator.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DefaultLocaleTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DefaultRenderKitIdTranslator.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DefaultValueTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DescriptionTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DisplayNameTranslator.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/DynamicElementTranslator.java497
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ELResolverTypeTranslator.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ExtensionTypeTranslator.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FacesConfigExtensionTranslator.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FacesConfigTranslator.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FacesContextFactoryTranslator.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FacetExtensionTranslator.java24
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FacetNameTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FacetTranslator.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FactoryExtensionTranslator.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FactoryTranslator.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FromActionTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FromOutcomeTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/FromViewIdTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/IAnyTranslator.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/IconTranslator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/KeyClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/KeyTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/LargeIconTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/LifecycleExtensionTranslator.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/LifecycleFactoryTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/LifecycleTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ListEntriesTranslator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/LocaleConfigTranslator.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ManagedBeanClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ManagedBeanExtensionTranslator.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ManagedBeanNameTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ManagedBeanScopeTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ManagedBeanTranslator.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ManagedPropertyTranslator.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/MapEntriesTranslator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/MapEntryTranslator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/MessageBundleTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/NavigationCaseTranslator.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/NavigationHandlerTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/NavigationRuleExtensionTranslator.java22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/NavigationRuleTranslator.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/NullValueTranslator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/PhaseListenerTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/PropertyClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/PropertyExtensionTranslator.java25
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/PropertyNameTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/PropertyResolverTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/PropertyTranslator.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RedirectTranslator.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ReferencedBeanClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ReferencedBeanNameTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ReferencedBeanTranslator.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RenderKitClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RenderKitExtensionTranslator.java22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RenderKitFactoryTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RenderKitIdTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RenderKitTranslator.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RendererClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RendererExtensionTranslator.java25
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RendererTranslator.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/RendererTypeTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ResourceBundleTranslator.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/SkipUnknownChildrenTranslator.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/SmallIconTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/StateManagerTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/SuggestedValueTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/SupportedLocaleTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ToViewIdTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ValidatorClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ValidatorExtensionTranslator.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ValidatorIdTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ValidatorTranslator.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ValueClassTranslator.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ValueTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/VarTranslator.java31
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/VariableResolverTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/internal/translator/ViewHandlerTranslator.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigArtifactEdit.java238
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigChangeEvent.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigResourceFactory.java91
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigResourceImpl.java133
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigRestartServerResourceDeltaVisitor.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesConfigUtil.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesRendererFactory.java221
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/FacesResourceChangeListener.java361
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/IFacesConfigChangeEvent.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/IFacesConfigChangeListener.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/IFacesConfigConstants.java23
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/IFacesConfigResource.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/util/IFacesconfigPreferences.java27
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_actionListener_ActionListenerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_defaultRenderKitId_DefaultRenderKitIdType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_localeConfig_LocaleConfigType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_messageBundle_MessageBundleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_navigationHandler_NavigationHandlerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_propertyResolver_PropertyResolverType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_stateManager_StateManagerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_variableResolver_VariableResolverType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateApplicationType_viewHandler_ViewHandlerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateAttributeType_attributeExtension_AttributeExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateAttributeType_attributeName_AttributeNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateAttributeType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateAttributeType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateAttributeType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_attribute_AttributeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_componentClass_ComponentClassType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_componentExtension_ComponentExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_componentType_ComponentTypeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_facet_FacetType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateComponentType_property_PropertyType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateConverterType_attribute_AttributeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateConverterType_converterExtension_ConverterExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateConverterType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateConverterType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateConverterType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateConverterType_property_PropertyType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_actionListener_ActionListenerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_applicationFactory_ApplicationFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_application_ApplicationType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_attributeExtension_AttributeExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_attributeName_AttributeNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_attribute_AttributeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_componentClass_ComponentClassType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_componentExtension_ComponentExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_componentType_ComponentTypeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_component_ComponentType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_converter_ConverterType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_defaultLocale_DefaultLocaleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_facesConfig_FacesConfigType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_facesContextFactory_FacesContextFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_factory_FactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_lifecycleFactory_LifecycleFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_lifecycle_LifecycleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_listEntries_ListEntriesType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_localeConfig_LocaleConfigType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_managedBean_ManagedBeanType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_managedProperty_ManagedPropertyType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_mapEntries_MapEntriesType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_mapEntry_MapEntryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_messageBundle_MessageBundleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_navigationCase_NavigationCaseType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_navigationHandler_NavigationHandlerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_navigationRule_NavigationRuleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_nullValue_NullValueType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_phaseListener_PhaseListenerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_propertyExtension_PropertyExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_propertyResolver_PropertyResolverType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_property_PropertyType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_redirect_RedirectType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_referencedBean_ReferencedBeanType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_renderKitFactory_RenderKitFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_renderKit_RenderKitType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_rendererExtension_RendererExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_renderer_RendererType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_stateManager_StateManagerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_supportedLocale_SupportedLocaleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_validator_ValidatorType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_value_ValueType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_variableResolver_VariableResolverType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDocumentRoot_viewHandler_ViewHandlerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateDynamicElement_childNodes_DynamicElement.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_application_ApplicationType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_component_ComponentType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_converter_ConverterType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_factory_FactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_lifecycle_LifecycleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_managedBean_ManagedBeanType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_navigationRule_NavigationRuleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_referencedBean_ReferencedBeanType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_renderKit_RenderKitType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacesConfigType_validator_ValidatorType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacetType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacetType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacetType_facetExtension_FacetExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacetType_facetName_FacetNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFacetType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFactoryType_applicationFactory_ApplicationFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFactoryType_facesContextFactory_FacesContextFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFactoryType_lifecycleFactory_LifecycleFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateFactoryType_renderKitFactory_RenderKitFactoryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateLifecycleType_lifecycleExtension_LifecycleExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateLifecycleType_phaseListener_PhaseListenerType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateListEntriesType_nullValue_NullValueType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateListEntriesType_value_ValueType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateLocaleConfigType_defaultLocale_DefaultLocaleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateLocaleConfigType_supportedLocale_SupportedLocaleType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_listEntries_ListEntriesType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_managedBeanExtension_ManagedBeanExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_managedProperty_ManagedPropertyType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedBeanType_mapEntries_MapEntriesType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedPropertyType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedPropertyType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedPropertyType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedPropertyType_listEntries_ListEntriesType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateManagedPropertyType_mapEntries_MapEntriesType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateMapEntriesType_mapEntry_MapEntryType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationCaseType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationCaseType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationCaseType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationCaseType_redirect_RedirectType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationRuleType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationRuleType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationRuleType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationRuleType_navigationCase_NavigationCaseType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateNavigationRuleType_navigationRuleExtension_NavigationRuleExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreatePropertyType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreatePropertyType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreatePropertyType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreatePropertyType_propertyExtension_PropertyExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateReferencedBeanType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateReferencedBeanType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateReferencedBeanType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRenderKitType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRenderKitType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRenderKitType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRenderKitType_renderKitExtension_RenderKitExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRenderKitType_renderer_RendererType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRendererType_attribute_AttributeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRendererType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRendererType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRendererType_facet_FacetType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRendererType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateRendererType_rendererExtension_RendererExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateResourceBundleType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateResourceBundleType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateResourceBundleType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateValidatorType_attribute_AttributeType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateValidatorType_description_DescriptionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateValidatorType_displayName_DisplayNameType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateValidatorType_icon_IconType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateValidatorType_property_PropertyType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/ctool16/CreateValidatorType_validatorExtension_ValidatorExtensionType.gifbin223 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ActionListenerType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ApplicationExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ApplicationFactoryType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ApplicationType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/AttributeClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/AttributeExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/AttributeNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/AttributeType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/BaseNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ComponentClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ComponentExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ComponentFamilyType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ComponentType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ComponentTypeType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ConverterClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ConverterExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ConverterForClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ConverterIdType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ConverterType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DefaultLocaleType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DefaultRenderKitIdType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DefaultValueType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DescriptionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DisplayNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DocumentRoot.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DynamicAttribute.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/DynamicElement.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ELResolverType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfigExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfigType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_ActionListener.gifbin222 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Application.gifbin671 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Component.gifbin166 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Converter.gifbin226 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Factory.gifbin211 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_LifeCycle.gifbin248 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_LocaleConfig.gifbin968 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_ManagedBean.gifbin916 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_MessageBundle.gifbin415 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_NavigationHandler.gifbin951 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Pageflow16.gifbin1022 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_PhaseListener.gifbin971 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Plugin.gifbin1022 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_PropertyResolver.gifbin931 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_RenderKit.gifbin962 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_StateManager.gifbin969 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_Validator.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_VariableResolver.gifbin918 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesConfig_ViewHandler.gifbin974 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacesContextFactoryType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacetExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacetNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FacetType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FactoryExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FactoryType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FromActionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FromOutcomeType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/FromViewIdType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/IconType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/KeyClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/KeyType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/LargeIconType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/LifecycleExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/LifecycleFactoryType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/LifecycleType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ListEntriesType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/LocaleConfigType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ManagedBeanClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ManagedBeanExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ManagedBeanNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ManagedBeanScopeType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ManagedBeanType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ManagedPropertyType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/MapEntriesType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/MapEntryType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/MessageBundleType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/NavigationCaseType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/NavigationHandlerType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/NavigationRuleExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/NavigationRuleType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/NullValueType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/PhaseListenerType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/PropertyClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/PropertyExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/PropertyNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/PropertyResolverType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/PropertyType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RedirectType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ReferencedBeanClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ReferencedBeanNameType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ReferencedBeanType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RenderKitClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RenderKitExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RenderKitFactoryType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RenderKitIdType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RenderKitType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RendererClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RendererExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RendererType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/RendererTypeType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ResourceBundleType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/SmallIconType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/StateManagerType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/SuggestedValueType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/SupportedLocaleType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ToViewIdType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ValidatorClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ValidatorExtensionType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ValidatorIdType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ValidatorType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ValueClassType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ValueType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/VarType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/VariableResolverType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/icons/full/obj16/ViewHandlerType.gifbin129 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/model/FacesConfig.ecore3793
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/model/facesConfig.genmodel576
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/model/templates/Header.javajetinc11
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.properties555
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.xml30
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.cvsignore1
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF15
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/build.properties20
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_core.xml353
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.properties42
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/jsf_html.xml685
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/metadata/symbolInfoMetadata.xml17
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties27
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.xml17
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/src/org/eclipse/jst/jsf/standard/tagsupport/StandardTagSupportPlugin.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties23
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.properties35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfcore.xml227
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.properties112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/configs/cm/jsfhtml.xml713
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gifbin858 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_ACTIONLISTENER.gifbin697 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_ATTRIBUTE.gifbin479 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_CONVERTDATETIME.gifbin1264 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_CONVERTER.gifbin712 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_CONVERTNUMBER.gifbin1167 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_FACET.gifbin744 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_LOADBUNDLE.gifbin713 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_PARAM.gifbin636 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_SELECTITEM.gifbin467 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_SELECTITEMS.gifbin730 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_SUBVIEW.gifbin757 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VALIDATEDOUBLERANGE.gifbin1105 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VALIDATELENGTH.gifbin1105 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VALIDATELONGRANGE.gifbin1105 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VALIDATOR.gifbin1105 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VALUECHANGELISTENER.gifbin782 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VERBATIM.gifbin447 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/large/JSF_VIEW.gifbin502 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_ACTIONLISTENER.gifbin222 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_ATTRIBUTE.gifbin169 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_CONVERTDATETIME.gifbin1005 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_CONVERTER.gifbin226 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_CONVERTNUMBER.gifbin932 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_FACET.gifbin950 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_LOADBUNDLE.gifbin415 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_PARAM.gifbin333 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_SELECTITEM.gifbin914 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_SELECTITEMS.gifbin931 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_SUBVIEW.gifbin964 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VALIDATEDOUBLERANGE.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VALIDATELENGTH.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VALIDATELONGRANGE.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VALIDATOR.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VALUECHANGELISTENER.gifbin958 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VERBATIM.gifbin122 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFCORE/small/JSF_VIEW.gifbin368 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_COLUMN.gifbin471 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_COMMANDBUTTON.gifbin325 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_COMMANDLINK.gifbin1039 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_DATATABLE.gifbin467 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_FORM.gifbin788 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_GRAPHICIMAGE.gifbin1141 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_INPUTHIDDEN.gifbin1109 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_INPUTSECRET.gifbin1087 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_INPUTTEXT.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_INPUTTEXTAREA.gifbin704 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_MESSAGE.gifbin490 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_MESSAGES.gifbin528 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_OUTPUTFORMAT.gifbin759 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_OUTPUTLABEL.gifbin804 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_OUTPUTLINK.gifbin823 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_OUTPUTTEXT.gifbin800 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_PANELGRID.gifbin316 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_PANELGROUP.gifbin438 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTBOOLEANCHECKBOX.gifbin418 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTMANYCHECKBOX.gifbin1154 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTMANYLISTBOX.gifbin493 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTMANYMENU.gifbin731 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTONELISTBOX.gifbin500 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTONEMENU.gifbin663 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/large/JSF_SELECTONERADIO.gifbin663 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_COLUMN.gifbin162 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_COMMANDBUTTON.gifbin150 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_COMMANDLINK.gifbin218 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_DATATABLE.gifbin343 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_FORM.gifbin959 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_GRAPHICIMAGE.gifbin601 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_INPUTHIDDEN.gifbin341 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_INPUTSECRET.gifbin227 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_INPUTTEXT.gifbin117 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_INPUTTEXTAREA.gifbin139 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_MESSAGE.gifbin163 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_MESSAGES.gifbin175 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_OUTPUTFORMAT.gifbin954 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_OUTPUTLABEL.gifbin956 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_OUTPUTLINK.gifbin958 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_OUTPUTTEXT.gifbin954 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_PANELGRID.gifbin123 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_PANELGROUP.gifbin206 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTBOOLEANCHECKBOX.gifbin149 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTMANYCHECKBOX.gifbin352 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTMANYLISTBOX.gifbin926 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTMANYMENU.gifbin177 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTONELISTBOX.gifbin924 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTONEMENU.gifbin160 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/palette/JSFHTML/small/JSF_SELECTONERADIO.gifbin166 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_core.xml215
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_core_dti.xml308
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_html.xml433
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/metadata/jsf_html_dti.xml852
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties15
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml693
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java193
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties12
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java211
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java110
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java110
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java155
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java132
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/ConverterValidatorIdDialogField.java81
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/celleditors/JSFAttributeCellEditorFactory.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java117
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties27
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java91
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java162
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java146
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java129
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java108
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java146
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java151
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java165
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java141
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java137
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java140
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java305
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java106
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java100
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java73
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java218
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java178
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java119
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java138
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java210
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java83
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java72
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java154
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java133
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java177
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java200
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java152
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java204
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java140
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java129
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java163
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java156
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java487
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java98
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java322
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java184
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreActionListenerSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreAttributeSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java281
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java217
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConverterSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreFacetSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreLoadBundleSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreParamSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreSelectItemSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreSelectItemsSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreSubviewSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreValidateDoubleRangeSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreValidateLengthSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreValidateLongRangeSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreValidatorSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreValueChangeListenerSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreVerbatimSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreViewSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java312
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlColumnSection.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlCommandButtonSection.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlCommandLinkSection.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java384
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableSection.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlFormSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlGraphicImageSection.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenSection.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java166
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java867
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java165
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java166
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java168
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlMessageSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlMessagesSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java398
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputLabelSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputLinkSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java318
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlPanelGridSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlPanelGroupSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectBooleanCheckboxSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java375
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectManyCheckboxSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectManyListboxSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectManyMenuSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectOneListboxSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectOneMenuSection.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectOneRadioSection.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties78
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties23
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_DECLARATION.gifbin535 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_DIRECTIVE.INCLUDE.gifbin449 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_DIRECTIVE.PAGE.gifbin1157 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_DIRECTIVE.TAGLIB.gifbin728 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_EXPRESSION.gifbin452 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_FALLBACK.gifbin973 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_FORWARD.gifbin582 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_GETPROPERTY.gifbin425 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_INCLUDE.gifbin567 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_PARAM.gifbin636 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_PARAMS.gifbin726 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_PLUGIN.gifbin758 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_ROOT.gifbin464 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_SCRIPTLET.gifbin1013 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_SETPROPERTY.gifbin425 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_TEXT.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/large/JSP_USEBEAN.gifbin791 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_DECLARATION.gifbin190 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_DIRECTIVE.INCLUDE.gifbin934 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_DIRECTIVE.PAGE.gifbin585 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_DIRECTIVE.TAGLIB.gifbin338 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_EXPRESSION.gifbin126 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_FALLBACK.gifbin327 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_FORWARD.gifbin215 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_GETPROPERTY.gifbin284 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_INCLUDE.gifbin213 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_PARAM.gifbin333 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_PARAMS.gifbin948 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_PLUGIN.gifbin244 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_ROOT.gifbin152 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_SCRIPTLET.gifbin531 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_SETPROPERTY.gifbin284 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_TEXT.gifbin117 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/icons/palette/JSP/small/JSP_USEBEAN.gifbin176 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/metadata/jsp11.properties60
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/metadata/jsp11.xml282
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties15
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd172
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java279
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java142
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java69
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java267
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/JSPContentModelMetaDataTranslator.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/TaglibMetaDataLocator.java170
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/metadata/TaglibMetaDataTLDTranslator.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java212
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java164
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java248
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java25
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java97
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/.classpath7
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/.cvsignore3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/.project30
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/.settings/org.eclipse.jdt.core.prefs77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF150
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/about.html22
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/build.properties25
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/configs/cm/html.properties156
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/configs/cm/html.xml1559
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/configs/cm/jsp.properties37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/configs/cm/jsp.xml119
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/default.properties12
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/MoveHandle.pngbin183 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Binding.gifbin133 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Binding_disabled.gifbin852 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Plugin.gifbin605 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_bold.gifbin923 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_bold_disabled.gifbin870 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_designer.gifbin248 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_hsplit.gifbin119 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_italic.gifbin880 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_italic_disabled.gifbin862 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_largefont.gifbin888 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_largefont_disabled.gifbin867 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_paragraph.gifbin581 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_smallfont.gifbin854 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_smallfont_disabled.gifbin852 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_source.gifbin153 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_underline.gifbin916 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_underline_disabled.gifbin882 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_Toolbar_vsplit.gifbin113 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/PD_nopic.jpgbin1006 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/newsuade_wiz.gifbin3148 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/large/PD_Palette_Default.gifbin300 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Default.gifbin82 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Export.gifbin958 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Export_Disabled.gifbin956 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Export_Hover.gifbin958 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Import.gifbin958 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Import_Disabled.gifbin957 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/GENERIC/small/PD_Palette_Import_Hover.gifbin958 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_A.gifbin1039 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_FORM.gifbin788 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_HEAD.gifbin1074 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_HR.gifbin192 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_IMG.gifbin1220 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_BUTTON.gifbin325 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_CHECKBOX.gifbin418 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_HIDDEN.gifbin1109 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_IMAGE.gifbin464 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_PASSWORD.gifbin816 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_RADIO.gifbin663 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_INPUT_TEXT.gifbin289 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_OBJECT.gifbin728 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_SELECT.gifbin467 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_TABLE.gifbin467 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/large/HTML_TEXTAREA.gifbin704 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_A.gifbin218 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_BR.gifbin885 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_FORM.gifbin959 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_HEAD.gifbin1074 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_HR.gifbin88 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_IMG.gifbin585 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_BUTTON.gifbin150 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_CHECKBOX.gifbin149 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_HIDDEN.gifbin341 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_IMAGE.gifbin218 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_PASSWORD.gifbin949 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_RADIO.gifbin166 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_INPUT_TEXT.gifbin117 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_OBJECT.gifbin176 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_SELECT.gifbin914 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_TABLE.gifbin343 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/HTML/small/HTML_TEXTAREA.gifbin139 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_DECLARATION.gifbin535 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_DIRECTIVE.INCLUDE.gifbin449 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_DIRECTIVE.PAGE.gifbin1157 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_DIRECTIVE.TAGLIB.gifbin728 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_EXPRESSION.gifbin452 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_FALLBACK.gifbin973 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_FORWARD.gifbin582 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_GETPROPERTY.gifbin425 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_INCLUDE.gifbin567 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_PARAM.gifbin636 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_PARAMS.gifbin726 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_PLUGIN.gifbin758 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_ROOT.gifbin464 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_SCRIPTLET.gifbin1013 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_SETPROPERTY.gifbin425 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_TEXT.gifbin358 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/large/JSP_USEBEAN.gifbin791 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_DECLARATION.gifbin190 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_DIRECTIVE.INCLUDE.gifbin934 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_DIRECTIVE.PAGE.gifbin585 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_DIRECTIVE.TAGLIB.gifbin338 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_EXPRESSION.gifbin126 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_FALLBACK.gifbin327 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_FORWARD.gifbin215 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_GETPROPERTY.gifbin284 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_INCLUDE.gifbin213 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_PARAM.gifbin333 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_PARAMS.gifbin948 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_PLUGIN.gifbin244 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_ROOT.gifbin152 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_SCRIPTLET.gifbin531 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_SETPROPERTY.gifbin284 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_TEXT.gifbin117 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/palette/JSP/small/JSP_USEBEAN.gifbin176 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/pin_down.gifbin133 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/icons/pin_up.gifbin138 -> 0 bytes-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/metadata/html.properties54
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/metadata/html.xml223
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/metadata/jsp11.properties60
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/metadata/jsp11.xml282
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.ecore84
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.genmodel48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/model/PaletteInfos.ecore81
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/model/PaletteInfos.genmodel48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties27
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml137
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/cmRegistry.exsd98
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/pageDesignerExtension.exsd147
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/popupMenuContributor.exsd83
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/propertyContributor.exsd76
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/propertySections.exsd132
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/tagCreationFactories.exsd86
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/schema/tagProperty.xsd154
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/IHTMLConstants.java495
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/IJMTConstants.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/JMTResources.properties235
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/PDPlugin.java429
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/container/ContainerActionGroup.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/AbstractLinkCreator.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/CreateLinkWizard.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/ExtensionReader.java80
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/HtmlLinkCreator.java69
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/ILinkCreator.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/LinkRequest.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/LinkUtil.java83
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/LinkWizardPage.java155
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/MakeLinkAction.java214
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/link/MakeLinkCommand.java96
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/menuextension/CustomedContextMenuActionGroup.java132
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/menuextension/RunAction.java125
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/AlignSupport.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ChangeStyleAction.java176
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/DesignerToolBarAction.java143
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/HTagsInsertGroupAction.java191
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/InsertTagChangeStyleAction.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneParagraphStyleAction.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/NoneStyleAction.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphAction.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphStyleAction.java143
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/ParagraphSupport.java70
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeActionGroup.java208
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeStyleAction.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/range/RangeStyleSupport.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/BorderStyleAction.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/BorderStyleSupport.java69
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/ChangeAttributeAction.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/ChangeStyleAction.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/ChangeStylePropertyAction.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/ColorSupport.java82
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SelectEditPartAction.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SelectNodeAction.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SelectParentAction.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/SingleElementActionGroup.java241
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/StyleClassSupport.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/single/StyleSupport.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableActionGroup.java196
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/actions/table/TableOperationContext.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/adapters/IBodyInfo.java91
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/adapters/internal/BodyInfo.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CloneNodeCommand.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CommandResources.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CommandResources.properties32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CopyAction.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CopyNodeCommand.java78
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CreateItemCommand.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CutAction.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/CutNodeCommand.java81
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DeleteAction.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DeleteNodeCommand.java115
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignAction.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignResizeComponentCommand.java146
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/DesignerCommand.java351
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/MoveNodeCommand.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/PDDropRequest.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/PDRequestConstants.java23
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/PaletteDropInsertCommand.java129
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/PasteAction.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/PasteNodeCommand.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/SourceViewerCommand.java115
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/SwitchSelectionCommand.java72
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableDeleteColumnCommand.java103
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableDeleteHeaderFooterCommand.java81
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableDeleteRowCommand.java96
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableInsertColumnCommand.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableInsertHeaderFooterCommand.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableInsertRowCommand.java159
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableResizeColumnCommand.java100
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/html/TableResizeRowCommand.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/CaretPositionTracker.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/HorizontalMoveCommand.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/ICaretPositionMover.java23
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/nav/VerticalMoveCommand.java201
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ApplyStyleCommand.java495
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/BlockNodeFinder.java126
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ClipboardData.java83
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ContentCommand.java124
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CopyCommand.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CopyEdit.java126
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CutCommand.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/CutEdit.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteCommand.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DeleteEdit.java283
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/DesignEdit.java408
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/IInputSourceProvider.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/InsertCommand.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/InsertEdit.java184
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/KeyboardData.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/Paragraph.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphApplyStyleCommand.java408
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphFinder.java124
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/ParagraphUnapplyStyleCommand.java85
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/PasteCommand.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/RangeModeCommand.java171
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/SelectAllCommand.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/UnapplyStyleCommand.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/range/WorkNode.java152
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/AddSubNodeCommand.java68
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeAttributeCommand.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeStyleCommand.java80
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/ChangeTagCommand.java133
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/InsertSubNodeCommand.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/RemoveSubNodeCommand.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/commands/single/SingleNodeCommand.java149
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/AbstractTagConverter.java457
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConvertPosition.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterFacRegistryReader.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterFactoryRegistry.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ConverterUtil.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DefaultUnknownTagConverter.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumDeepTagConverter.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumDescriptionTagConverter.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/DumTagConverter.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HTMLStringTagConverter.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HiddenTagConverter.java163
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/HiddenTagConverter2.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/IConverterFactory.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/IDOMFactory.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/ITagConverter.java121
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/JSFConverterUtil.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/PreferenceReader.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/TagConverterToDumBlock.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/TagConverterToInlineBlock.java80
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/TagConverterToSpan.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/ATagConverter.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/HTMLConverterFactory.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/html/TableTagConverter.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/IncludeTagConverterPreview.java196
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/converter/jsp/JSPConverterFactory.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/CSSTempUtil.java146
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/CSSUtil.java241
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/ICSSStyle.java139
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/border/CSSBorder.java526
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorConverter.java129
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorDefaults.java284
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/color/CSSColorManager.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/CSSFont.java121
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/CSSFontManager.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/ICSSFont.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/font/ICSSFontManager.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/html4.css155
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockBox.java101
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlow.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowContext.java283
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BlockFlowLayout.java252
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/BoxUtil.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBlockFlowLayout.java745
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSBrFlowLayout.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSFigure.java514
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSInlineFlowLayout.java319
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSLayout.java456
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSListItemLayout.java185
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSPageFlowLayout.java186
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextFigure.java299
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSTextLayout.java177
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CSSWidgetLayout.java221
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/CompositeBox.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/Debug.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/DisplayToLayout.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FigureUtil.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowBox.java161
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContainerLayout.java177
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowContext.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigure.java190
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowFigureLayout.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowPage.java161
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/FlowUtilities.java260
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/ICSSFigure.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/ICSSLayout.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/ICSSPainter.java29
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/ICSSPainter2.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/LineBox.java414
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/MultiLineLabel.java126
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/PageFlowLayout.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextFragmentBox.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/TextLayoutSupport.java386
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/WidgetBox.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRGroupLayout.java176
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTRLayout.java144
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableCaptionLayout.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableCellLayout.java208
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CSSTableLayout2.java633
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/CachedTableCellLayout.java250
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCaptionInfo.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableCellInfo.java218
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfo.java369
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableInfoContext.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableItemInfo.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableRowGroupInfo.java103
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/layout/table/TableRowInfo.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CSSHtmlListStyleData.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CSSMarkerStyleData.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/ContentObject.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterHelper.java297
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/CounterValueGenerator.java441
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/HTMLListInfoHelper.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/ICounterValueGenerator.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/IIndexConverter.java19
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/IncrementObject.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/ListStyleUtil.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/list/ResetObject.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/CounterFactory.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/CounterUtil.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/DecimalCounter.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/EnumerableCounter.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/ICounter.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/marker/RomanCounter.java121
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BackgroundColorMeta.java82
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderCollapseMeta.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderColorMeta.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderSpacingMeta.java119
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderStyleMeta.java183
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/BorderWidthMeta.java240
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CSSMetaRegistry.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CSSPropertyMeta.java124
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ColorPropertyMeta.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ContentMeta.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterIncrementMeta.java90
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/CounterResetMeta.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/DisplayMeta.java69
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/EmptyCellsMeta.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FloatInfo.java149
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontFamilyMeta.java138
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontSizeMeta.java188
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontStyleMeta.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/FontWeightMeta.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/HeightMeta.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/HorizontalAlignMeta.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ICSSPropertyID.java382
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ICSSPropertyMeta.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/LengthMeta.java207
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ListStyleImageMeta.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ListStylePositionMeta.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/ListStyleTypeMeta.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/MarginWidthMeta.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/OverflowMeta.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/PaddingWidthMeta.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/PositionMeta.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/PositionOffsetMeta.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TableUtil.java98
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TextAlignMeta.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/TextDecorationMeta.java95
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/VerticalAlignMeta.java104
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/VisibilityMeta.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/WhiteSpaceMeta.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/property/WidthMeta.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/provider/DimensionInfo.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/provider/ICSSTextProvider.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/provider/ICSSWidgetProvider.java58
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/AbstractStyle.java658
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ControlOverrideSupport.java85
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/DefaultStyle.java257
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/HiddenElementStyle.java84
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/IRangeSelectionProxy.java25
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ITagEditInfo.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/ImageStyleHelper.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/style/StyleUtil.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/value/Length.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/AbstractWidgetProvider.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/BorderUtil.java268
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ButtonWidgetProvider.java203
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/CheckboxWidgetProvider.java98
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ComboWidgetProvider.java209
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/HiddenProvider.java139
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ImageWidgetProvider.java109
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/InputFileWidgetProvider.java175
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/ListWidgetProvider.java211
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/RadioWidgetProvider.java108
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/TextAreaWidgetProvider.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/css2/widget/TextInputWidgetProvider.java164
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/FeedBackInfo.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/ILocalDropHandler.java83
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/LocalDropRequest.java62
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceDropTargetListener.java138
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerSourceMouseTrackAdapter.java154
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DesignerTemplateTransferDragSourceListener.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/DropSelectionWizard.java134
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalDropCommand.java124
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalDropEditPolicy.java235
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/LocalSelectionDropTargetListener.java125
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/Messages.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/PDTemplateTransferDropTargetListener.java113
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/RegistryReader.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/ResouceDropTargetListener.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SimpleWizardSelectionPage.java272
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SourceViewLocalDropCommand.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/SourceViewerDragDropHelper.java343
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/TextEditorDropTargetListenerFactory.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dnd/internal/messages.properties17
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/CaretMoveIterator.java262
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPosition.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMPositionHelper.java391
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRange.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRangeHelper.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition.java142
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMRefPosition2.java125
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMStyleUtil.java172
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/DOMUtil.java231
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditHelper.java476
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditModelQuery.java1775
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/EditValidateUtil.java381
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/IDOMPosition.java58
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/IDOMRefPosition.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/JSFValidatorSupport.java118
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/ValidatorSupport.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/ColStructure.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/TableChildElementPosition.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dom/html/TableUtil.java530
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DTManager.java117
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DefaultDTInfo.java87
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DefaultDTInfoFactory.java80
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/IDTInfo.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/IDTInfoFactory.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/AbstractTagConverterContext.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/IOutputRenderer.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITagConverterContext.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITagConverterDecorator.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITransformOperation.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITransformer.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/DTHTMLOutputRenderer.java144
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/DTTagConverter.java400
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/DTTagConverterContext.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/DTTagConverterDecorator.java206
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/DTTagConverterFactory.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/DefaultTransformer.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AbstractTransformOperation.java171
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/TransformOperationFactory.java309
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/AppendChildElementOperation.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/AppendChildTextFromXPathOperation.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/AppendChildTextOperation.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/ConvertAttributeToTextOperation.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/CopyAllAttributesOperation.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/CopyAttributeOperation.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/CopyChildrenOperation.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/CreateAttributeFromXPathOperation.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/CreateAttributeOperation.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/CreateElementOperation.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/IfNotOperation.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/IfOperation.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/IterateOverElementsOperation.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/MakeParentElementCurrentOperation.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/RemoveAttributeOperation.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/RenameAttributeOperation.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfo.java85
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfoFactory.java101
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfoPackage.java891
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/Operation.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/Parameter.java64
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/ResolveAttributeValue.java64
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/TagConvertInfo.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/TagDecorateInfo.java369
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoFactoryImpl.java159
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoImpl.java225
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java562
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/OperationImpl.java261
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ParameterImpl.java168
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ResolveAttributeValueImpl.java168
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java151
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagDecorateInfoImpl.java788
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoAdapterFactory.java212
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoSwitch.java242
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/DesignerStructuredTextEditorJSP.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/HTMLEditor.java1039
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/IDesignViewer.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/OutlineConfiguration.java72
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/PageDesignerActionConstants.java142
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SelectionSynchronizer.java163
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/SimpleGraphicalEditor.java735
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ActionsMessages.properties43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ChangeStyleAction.java180
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DataBindingViewAction.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignActionBarFactory.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignPageActionContributor.java219
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerStyleActionGroup.java188
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/DesignerUndoRedoAction.java107
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/OutlineViewAction.java25
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PageDesignerActionBarContributor2.java339
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PaletteViewAction.java107
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/PropertiesViewAction.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/RelatedViewActionGroup.java145
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/ShowViewAction.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/actions/SourcePageActionContributor.java100
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/DelegatingZoomManager.java374
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/IPageDesignerConstants.java125
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/JSPEditorMessages.properties23
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/MessageFormater.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/pagedesigner/PageDesignerResources.java54
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizationsHelper.java223
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizer.java164
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteCustomizerDialog.java363
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteImages.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRoot.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteRootFactory.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteViewer.java196
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/DesignerPaletteViewerProvider.java109
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/IEntryChangeListener.java27
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/IPaletteConstants.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/IPaletteItemManager.java80
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/ShowAllAction.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/TagToolPaletteEntry.java85
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java203
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java394
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteItemManager.java340
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/TaglibPaletteDrawer.java106
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/internal/metadata/HTMLContentModelMetaDataTranslator.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfo.java301
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfos.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosFactory.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java710
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationAttribute.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationInfo.java82
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationTemplate.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java729
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java151
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java166
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java517
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationAttributeImpl.java222
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java220
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java178
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosAdapterFactory.java195
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosSwitch.java221
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/AbsolutePointLocator.java100
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/BasicLabelToolTip.java55
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ColumnHelper.java68
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ColumnResizableEditPolicy.java215
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/CornerRelativeHandleLocator.java109
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DesignerElementEditPolicy.java137
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DragMoveEditPolicy.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DropEditPolicy.java182
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementDecoratorSquareHandle.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementMenuBar.java210
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ElementResizableEditPolicy.java488
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentCornerHandle.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java196
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/IEnhancedSelectionEditPolicy.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/ITableEditAdapter.java72
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/JSFDropEditPolicy.java88
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LinkEditPolicy.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java192
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/MouseSelectableChildDecorator.java592
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/MoveSupport.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/NonVisualChildDecorator.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/NonVisualChildGraphicalEditPolicy.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/PDEditPolicy.java19
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/PolicyHelper.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java102
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/ElementEditFacRegistryReader.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/ElementEditFactoryRegistry.java106
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEdit.java93
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEditFactory.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/HTMLElementEditFactory.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/TableElementEdit.java271
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/JSPElementEditFactory.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/TaglibElementEdit.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/TaglibURIAction.java145
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/extensionpoint/IContextMenuItemContributor.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/AbstractFigureHandler.java75
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/BRFigureHandler.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/DefaultFigureHandler.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/FigureFactory.java220
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/HiddenFigureHandler.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/IFigureHandler.java33
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/ImgFigureHandler.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/InputFigureHandler.java191
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/ObjectFigureHandler.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/SelectFigureHandler.java86
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/TextareaFigureHandler.java49
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/figurehandler/WidgetFigureHandler.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ITagCreator.java30
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationEditPolicy.java138
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationRequest.java89
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/ItemCreationTool.java267
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/TagCreationFactory.java56
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java374
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/AttributeDescriptor.java204
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/BindingHandlerDelegate.java116
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/EditorCreator.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/IAttributeCellEditorFactory.java68
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/IAttributeDescriptor.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/IBindingHandler.java70
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/ICMRegistry.java34
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/IElementDescriptor.java66
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/IValueType.java60
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CMRegistry.java206
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CategoryNameComparator.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CellEditorFacRegistryReader.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/CellEditorFactoryRegistry.java201
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/DefaultEditorCreator.java226
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/ElementDescReader.java433
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/ElementDescriptor.java122
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/LocaleFallback.java106
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/meta/internal/SimpleCMRegistry.java72
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/CSSStyleAdapterFactory.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/DocumentEditPart.java217
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/EditProxyAdapter.java70
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java631
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/HTMLEditPartsFactory.java71
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java239
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NonVisualComponentEditPart.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/Refresher.java119
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/RefresherFactory.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/SubNodeEditPart.java26
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/TextEditPart.java187
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PageExpressionContext.java189
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewConvertContext.java132
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewHandlerNew.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewResources.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewResources.properties16
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/WindowsIEBrowser.java69
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AllPropertySection.java142
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertyDescriptor.java169
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySource.java181
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/AttributePropertySourceProvider.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/BaseCustomSection.java194
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerPropertyTool.java410
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/DesignerTabbedPropertySheetPage.java184
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/ISectionFilter.java28
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/ITabbedPropertiesConstants.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/MyPropertySheetPage.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/NavigationHiearchyAction.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/PropertyDescriptorWrapper.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroup.java342
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroupMessages.java76
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/AttributeGroupSection.java111
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/DialogUtil.java121
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/IElementContextable.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/attrgroup/messages.properties14
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CSSDialogCellEditor.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CellEditorFactory.java483
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/CellEditorWrapper.java358
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/EditableDialogCellEditor.java140
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledComboBoxCellEditor.java149
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LabeledStyleComboCellEditor.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/LoadbundleSelectionCellEditor.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/NamedBooleanCellEditor.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/ResourceBoundle.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/ResourceDialogCellEditor.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/StyleComboCellEditor.java241
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/celleditors/messages.properties13
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DesignerSectionDescriptor.java273
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/properties/internal/DesignerTabPropertySectionDescriptorProvider.java141
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/range/RangeUtil.java367
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/LocationModifierRequest.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/NodeCreationFactory.java123
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/requests/PageDesignerRequestConstants.java24
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/ColumnHandle.java31
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/ColumnResizeHandle.java35
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/DeleteHeaderFooterAction.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/DeleteHeaderFooterRequest.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/DeleteRowColumnAction.java47
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/EmptyLocator.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/InsertHeaderFooterAction.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/InsertHeaderFooterRequest.java42
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/InsertRowColumnAction.java45
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/MarqueeRectangleFigure.java85
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/RowHandle.java31
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/RowResizeHandle.java36
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableColumnHandle.java64
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableColumnHandleLocator.java109
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditAdapter.java158
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditConst.java22
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableEditHelper.java40
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableHandleKit.java53
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableInsertRequest.java39
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableResizableEditPolicy.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableResizeRequest.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableRowColumnDeleteRequest.java29
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableRowColumnRequest.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableRowHandle.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableRowHandleLocator.java108
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideHandle.java60
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemDragTracker.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideItemHandle.java78
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideResizeDragTracker.java175
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tableedit/TableSideResizeHandle.java51
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/ExposeHelper.java313
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/ObjectModeDragTracker.java57
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeDragTracker.java314
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/tools/RangeSelectionTool.java344
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/CommonResourceDialog.java407
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/PartActivationHandler.java96
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/ResourceOnClasspathDialog.java252
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/TreeViewerSelectionDialog.java321
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/NestedEditorActionBarContributor.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorPart.java525
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorSelectionProvider.java154
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/common/sash/SashEditorSite.java439
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/ContextableClasspathResourceButtonDialogField.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/ContextableResourceButtonDialogField.java67
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/DialogFieldWrapper.java411
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/ExtendedResourceButtonDialogField.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogfields/StyleButtonDialogField.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroudPreferenceNode.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BackgroundPreferencePage.java316
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferenceNode.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BlockPreferencePage.java394
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferenceNode.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BorderPreferencePage.java534
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferenceNode.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/BoxPreferencePage.java669
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ColorUtil.java215
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/DialogsMessages.java38
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/DialogsMessages.properties93
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferenceNode.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ExtensionsPreferencePage.java184
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/IStyleConstants.java110
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferenceNode.java135
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/ListPreferencePage.java159
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferenceNode.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/PositioningPreferencePage.java778
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/StyleCombo.java44
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/StyleDialog.java60
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferenceNode.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/ui/dialogs/TextPreferencePage.java521
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/BodyHelper.java339
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CacheManager.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/CommandUtil.java50
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/DOMUtil.java239
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/EntityMap.java204
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLSpecialCharHelper.java421
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/HTMLUtil.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ICacheEntryCreator.java18
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ImageResolver.java92
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/IntFlexArray.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JSPUtil.java261
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/JavaUtil.java97
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/NodeLocationComparator.java74
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/PreviewUtil.java343
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/ProjectResolver.java488
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectManyHelper.java210
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/SelectionHelper.java378
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/StructuredModelUtil.java70
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/UriAdapterFactory.java52
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/WebAppUtil.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/utils/XMLUtil.java110
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/ActionData.java65
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/BasicMovementRule.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/BasicPositionRule.java91
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/ContainerMoveInAndOutRule.java101
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultMovementRule.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionRule.java112
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DefaultPositionValidator.java227
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DnDPositionValidator.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/DropActionData.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/HeadDataPositionRule.java27
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IEPanelgridPositionRule.java48
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IETablePositionRule.java202
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IMovementMediator.java32
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IMovementRule.java21
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IPositionMediator.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IPositionRule.java61
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/IValidationRule.java19
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/InlineEditingNavigationMediator.java185
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/InlineEditingPositionMediator.java37
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/JSFRootContainerPositionRule.java147
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/NodeConstructionPositionRule.java27
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/RootContainerPositionRule.java114
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/Target.java97
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/WhitespacePositionMoveRule.java148
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/AbstractDropLocationStrategy.java77
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretPositionResolver.java318
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/CaretUpdater.java231
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DefaultDropLocationStrategy.java157
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignPosition.java182
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignRange.java79
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/DesignRefPosition.java46
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/EditPartPositionHelper.java682
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/FlowBoxLine.java208
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/HTMLGraphicalViewer.java524
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/IDropLocationStrategy.java59
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/IHTMLGraphicalViewer.java63
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/IHTMLGraphicalViewerListener.java23
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/LayoutPart.java471
-rw-r--r--jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/viewer/TextPosition.java74
2305 files changed, 0 insertions, 315787 deletions
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.classpath b/assembly/plugins/org.eclipse.jsf.branding/.classpath
deleted file mode 100644
index 7cec603db..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.classpath
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <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 7033a799b..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@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 412b7ac4e..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.Name
-Bundle-SymbolicName: org.eclipse.jsf
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-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 7c80c6cde..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>June 06, 2007</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 ab20e7886..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-bin.includes = META-INF/,\
- eclipse32.png,\
- eclipse32.gif,\
- about.properties,\
- about.mappings,\
- about.ini,\
- about.html,\
- plugin.properties,\
- component.xml
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/component.xml b/assembly/plugins/org.eclipse.jsf.branding/component.xml
deleted file mode 100644
index d470a56d8..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/component.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jsf">
-<description url=""></description>
-<component-depends unrestricted="true"></component-depends>
-<plugin id="org.eclipse.jst.jsf.common" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.common.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.core" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.standard.tagsupport" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.facesconfig" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.facesconfig.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.pagedesigner" fragment="false"/>
-<plugin id="org.eclipse.jst.pagedesigner.jsf.ui" fragment="false"/>
-<plugin id="org.eclipse.jst.pagedesigner.jsp.core" fragment="false"/>
-<plugin id="org.eclipse.jst.jsf.doc.dev" fragment="false"/>
-</component>
-
-
-
-
-
-
-
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 2b7a86451..000000000
--- a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-plugin.Name=JavaServer Faces Tools
-plugin.Provider=Eclipse.org \ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/.cvsignore b/jsf/features/org.eclipse.jst.webpageeditor.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/.project b/jsf/features/org.eclipse.jst.webpageeditor.feature/.project
deleted file mode 100644
index e08915529..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.webpageeditor.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/build.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/build.properties
deleted file mode 100644
index cb50260a9..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.webpageeditor.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/epl-v10.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
deleted file mode 100644
index 09211a4ed..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Web Page Editor
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web Tools Platform (WTP) Web Page Editor
-
-# "copyright" property - text of the "Feature Update Copyright"
-feature.copyright=\
-Copyright (c) 2007 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 7, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
deleted file mode 100644
index 6df9c58d2..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.webpageeditor.feature"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore" version="2.2.0"/>
- <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.ui" version="1.0.101" match="equivalent"/>
- <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.jsp.core" version="1.1.0"/>
- <import plugin="org.eclipse.jst.jsp.ui" version="1.1.0"/>
- <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.pagedesigner.jsp.core" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.ui.properties" version="1.0.101"/>
- <import plugin="org.eclipse.jst.jsf.common.ui" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.jsf.core" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
- <import plugin="org.eclipse.wst.html.ui" version="1.0.100" match="equivalent"/>
- <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="equivalent"/>
- <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.jst.pagedesigner" version="1.0.0" match="equivalent"/>
- <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
- <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
- </requires>
-
- <plugin
- id="org.eclipse.jst.pagedesigner"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.pagedesigner.jsf.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.pagedesigner.jsp.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/license.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/license.html
deleted file mode 100644
index a450af950..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/license.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also 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, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/build.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 657ba1b2d..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be NOT be translated.
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad2955..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index bea5ceb80..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,147 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be translated.
-# feature.properties
-# contains externalized strings for feature.xml
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-#
-# "featureName" property - name of the feature
-featureName=Web Page Editor Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Source code zips for Web Page Editor.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-2007 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
- - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.xml
deleted file mode 100644
index c1eebe00a..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.webpageeditor.feature.source"
- label="%featureName"
- version="1.0.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
- </url>
-
-
- <plugin
- id="org.eclipse.jst.webpageeditor.feature.source"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a489a..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
- modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index d4916df47..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +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>June 06, 2007</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>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a2e..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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 (not 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/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.mappings b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/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@
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e3cbbc358..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be translated.
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Page Editor Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2007. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5895597f9..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gif b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.png b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49de2..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 46b3449b8..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# This file should be translated.
-# plugin.properties
-# contains externalized strings for manifest.mf
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-pluginName=Web Page Editor Source
-providerName=Eclipse.org
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project
deleted file mode 100644
index 1e4ee0039..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.webpageeditor_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties
deleted file mode 100644
index 52970fa15..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
-
-generate.feature@org.eclipse.jst.webpageeditor.feature.source = org.eclipse.jst.webpageeditor.feature
- \ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
deleted file mode 100644
index 8fb7e2922..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Web Page Editor SDK
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Web Tools Platform (WTP) Web Page Editor SDK
-
-# "copyright" property - text of the "Feature Update Copyright"
-feature.copyright=\
-Copyright (c) 2007 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 7, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
deleted file mode 100644
index c517c78cb..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.webpageeditor_sdk.feature"
- label="SDK for WebPageEditor"
- version="1.0.0.qualifer"
- provider-name="Eclipse.org">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
- <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
- </url>
-
- <includes
- id="org.eclipse.jst.webpageeditor.feature"
- version="0.0.0"/>
- <includes
- id="org.eclipse.jst.webpageeditor.feature.source"
- version="0.0.0"/>
-</feature>
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html
deleted file mode 100644
index a450af950..000000000
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/license.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse
-Foundation is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this
-Content and is also 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, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code,
-documentation and other files maintained in the Eclipse.org CVS repository
-("Repository") in CVS modules ("Modules") and made available as downloadable
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained
-in files named "about.html" ("Abouts"). The terms and conditions governing
-Features and Included Features should be contained in files named "license.html"
-("Feature Licenses"). Abouts and Feature Licenses may be located in any
-directory of a Download or Module including, but not limited to the following
-locations:</P>
-<UL>
- <LI>The top-level (root) directory
- <LI>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed
-using the Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains Included
-Features, the Feature Update License should either provide you with the terms
-and conditions governing the Included Features or inform you where you can
-locate them. Feature Update Licenses may be found in the "license" property of
-files named "feature.properties". Such Abouts, Feature Licenses and Feature
-Update Licenses contain the terms and conditions (or references to such terms
-and conditions) that govern your use of the associated Content in that
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
- <LI>Common Public License Version 1.0 (available at <A
- href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
- <LI>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <LI>Apache Software License 2.0 (available at <A
- href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
- <LI>IBM Public License 1.0 (available at <A
- href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-
- <LI>Metro Link Public License 1.00 (available at <A
- href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)
-
- <LI>Mozilla Public License Version 1.1 (available at <A
- href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)
-
- <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
- </LI></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is
-provided, please contact the Eclipse Foundation to determine what terms and
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are
-currently may have restrictions on the import, possession, and use, and/or
-re-export to another country, of encryption software. BEFORE using any
-encryption software, please check the country's laws, regulations and policies
-concerning the import, possession, or use, and re-export of encryption software,
-to see if this is permitted.</P></BODY></HTML>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.classpath b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.classpath
deleted file mode 100644
index 304e86186..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore
deleted file mode 100644
index 2a89e4b88..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot
-build.xml
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.project b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.project
deleted file mode 100644
index 9615dd9c8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.common.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.common.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0f6f7ac44..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,77 +0,0 @@
-#Tue Apr 10 08:59:53 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-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=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c152..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 282f4c4dd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.jsf.common.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)"
-Export-Package: org.eclipse.jst.jsf.common.ui;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.jsf.common.ui.internal.actions;x-friends:="org.eclipse.jst.jsf.facesconfig.ui",
- org.eclipse.jst.jsf.common.ui.internal.dialogfield;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.jsf.common.ui.internal.dialogs;x-friends:="org.eclipse.jst.pagedesigner",
- org.eclipse.jst.jsf.common.ui.internal.guiutils;x-friends:="org.eclipse.jst.pagedesigner",
- org.eclipse.jst.jsf.common.ui.internal.logging;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.jsf.common.ui.internal.utils;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.facesconfig.ui,org.eclipse.jst.pagedesigner.jsf.ui"
-Eclipse-LazyStart: true
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.html b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.html
deleted file mode 100644
index 7c80c6cde..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/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>June 06, 2007</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/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.ini b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.ini
deleted file mode 100644
index a21a3ecea..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/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/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.mappings b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.mappings
deleted file mode 100644
index 29ddddb7e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/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=200509071822 \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties
deleted file mode 100644
index d7849b83b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties
+++ /dev/null
@@ -1,27 +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
-###############################################################################
-#
-#
-
-
-# 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=JSF Faces Config Editor \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2004. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/jsf
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties
deleted file mode 100644
index 252400474..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- bin/,\
- build.properties,\
- default.properties,\
- eclipse32.gif,\
- icons/,\
- plugin.properties,\
- schema/
-javacSource=1.5
-javacTarget=1.5 \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties
deleted file mode 100644
index 6d1ed5c72..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-# This file contains all the Default Preference Settings
-
-####################################################
-# Logging Preference Settings
-####################################################
-
-# Enable/Disable console logging.
-# Valid values: TRUE, FALSE
-console.logging.on=true
-
-# Maximum log level of console logging.
-# Valid values: DEBUG, INFO, WARN, ERROR, FATAL
-console.logging.max.level=INFO
-
-# Enable/Disable eclipse logging.
-# Valid values: TRUE, FALSE
-eclipse.logging.on=true
-
-# Maximum log level of eclipse logging.
-# Valid values: DEBUG, INFO, WARN, ERROR, FATAL
-eclipse.logging.max.level=INFO
-
-eclipse.pattern=%m
-
-# Enable/Disable file logging.
-# Valid values: TRUE, FALSE
-file.logging.on=true
-
-# Maximum log level of file logging.
-# Valid values: DEBUG, INFO, WARN, ERROR, FATAL
-file.logging.max.level=DEBUG
-
-# Clear log file when eclipse restarts.
-# Valid values: TRUE, FALSE
-file.logging.startup.clear=true
-
-# Location of log file
-file.logging.path=facesconfigeditor.log
-
-# Rollover frequency of log file.
-# Valid values: DAILY, WEEKLY, MONTHLY
-file.logging.rollover.frequency=DAILY
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gif
deleted file mode 100644
index e6ad7ccd7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gif
deleted file mode 100644
index 03f656f3e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gif
deleted file mode 100644
index 0e5bcf65a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gif
deleted file mode 100644
index 44cd0448b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gif
deleted file mode 100644
index ad8e5b6b9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gif
deleted file mode 100644
index 740419b4a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gif
deleted file mode 100644
index aebc0b2a3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gif
deleted file mode 100644
index 7a1511dd8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gif
deleted file mode 100644
index 9d70301da..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gif
deleted file mode 100644
index 03f656f3e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gif
deleted file mode 100644
index a063c230a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gif
deleted file mode 100644
index d71dffff4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gif
deleted file mode 100644
index 4eb53ec41..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
deleted file mode 100644
index a9b031f05..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-
-pluginName=JavaServer Faces Tools - Common UI
-pluginProvider=Eclipse.org
-
-extension-point.name.0 = Introduction Page
-extension-point.name.1 = OverviewPage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml
deleted file mode 100644
index 435be3ad3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="introductionPage" name="%extension-point.name.0" schema="schema/introductionPage.exsd"/>
- <extension-point id="overviewPage" name="%extension-point.name.1" schema="schema/overviewPage.exsd"/>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd b/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd
deleted file mode 100644
index d147b347a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common.ui" id="introductionPage" name="Introduction Page"/>
- </appInfo>
- <documentation>
- The purpose of this extension point is to allow plug-ins to describe the contents and links on a introduction page of an editor.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="introductionpage"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- identifier of the extension instance, this should be the same as the editor id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance. Normally this is the editor name.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="introductionpage">
- <annotation>
- <documentation>
- The details for an introduction page for a specific plugins editor
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="introductionelement" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of the page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description for the page.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="introductionelement">
- <annotation>
- <documentation>
- An element that make up a section of the page. Elements can contain Headers, Hyperlinks, Icons and text.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- An icon to display in the element. The icon should be 72x72 and will appear to the left of the headers, hyperlinks and text
- </documentation>
- <appInfo>
- <meta.attribute kind="resource"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="heading" type="string">
- <annotation>
- <documentation>
- A short heading for the element (optional)
- </documentation>
- </annotation>
- </attribute>
- <attribute name="text" type="string">
- <annotation>
- <documentation>
- The text description for the element
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlink" type="string">
- <annotation>
- <documentation>
- A hyperlink associated with the element. The hyperlink would normally execute the hyperlinkaction action
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlinkaction" type="string">
- <annotation>
- <documentation>
- The action associated with the hyperlink. This is an action that will be executed when the hyperlink is selected
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="actionparameters" type="string">
- <annotation>
- <documentation>
- Can be used to pass one or more parameters to the hyperlink action. Parameter must be space separated (optional)
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- &lt;extension
- id=&quot;org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor&quot;
- name=&quot;%pageflow.editor.intro.name&quot;
- point=&quot;org.eclipse.jst.jsf.facesconfig.ui.page.introductionPage&quot;&gt;
- &lt;introductionpage
- name=&quot;%pageflow.editor.intro.name&quot;
- description=&quot;%port.editor.intro.description&quot;&gt;
- &lt;introductionelement
- icon=&quot;icons/pageflow_72.gif&quot;
- heading=&quot;%pageflow.editor.intro.heading&quot;
- text=&quot;%pageflow.editor.intro.description&quot;&gt;
- &lt;/introductionelement&gt;
- &lt;introductionelement
- actionparameters=&quot;Pageflow.designerCheatSheet&quot;
- icon=&quot;icons/tutorials_72.gif&quot;
- hyperlinkaction=&quot;org.eclipse.jst.jsf.common.ui.actions.LoadCheatSheetAction&quot;
- text=&quot;%pageflow.editor.intro.cheatsheets.text&quot;
- hyperlink=&quot;%pageflow.editor.intro.cheatsheets.link&quot;&gt;
- &lt;/introductionelement&gt;
- &lt;introductionelement
- actionparameters=&quot;http://www.eclipse.org&quot;
- icon=&quot;icons/overview_72.gif&quot;
- hyperlinkaction=&quot;org.eclipse.jst.jsf.common.ui.actions.LoadHelpAction&quot;
- text=&quot;%pageflow.editor.intro.help.text&quot;
- hyperlink=&quot;%pageflow.editor.intro.help.link&quot;&gt;
- &lt;/introductionelement&gt;
- &lt;introductionelement
- actionparameters=&quot;overview&quot;
- icon=&quot;icons/gotoeditor_72.gif&quot;
- hyperlinkaction=&quot;org.eclipse.jst.jsf.common.ui.actions.OpenPageAction&quot;
- text=&quot;%pageflow.editor.intro.start.text&quot;
- hyperlink=&quot;%pageflow.editor.intro.start.link&quot;&gt;
- &lt;/introductionelement&gt;
- &lt;/introductionpage&gt;
- &lt;/extension&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004, 2006 Sybase, Inc. and others. &lt;br&gt;
- All rights reserved. This program and the accompanying materials &lt;br&gt;
- are made available under the terms of the Eclipse Public License v1.0 &lt;br&gt;
- which accompanies this distribution, and is available at &lt;br&gt;
- http://www.eclipse.org/legal/epl-v10.html &lt;br&gt;
-
- Contributors: &lt;br&gt;
- Sybase, Inc. - initial API and implementation &lt;br&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd b/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd
deleted file mode 100644
index c55436b40..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common.ui" id="overviewPage" name="Overview Page"/>
- </appInfo>
- <documentation>
- The purpose of this extension point is to allow plug-ins to describe the contents and links on a overview page of an editor.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="overviewpage"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- identifier of the extension instance, this should be the same as the editor id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance. Normally this is the editor name.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="overviewpage">
- <annotation>
- <documentation>
- The details for an overview page for a specific plugins editor
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="overviewelement" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of the page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description for the page.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="overviewelement">
- <annotation>
- <documentation>
- An element that make up a section of the page. Elements can contain Headers, Hyperlinks, Icons and text.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- An icon to display in the element. The icon should be 72x72 and will appear to the left of the headers, hyperlinks and text
- </documentation>
- <appInfo>
- <meta.attribute kind="resource"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="heading" type="string">
- <annotation>
- <documentation>
- A short heading for the element (optional)
- </documentation>
- </annotation>
- </attribute>
- <attribute name="text" type="string">
- <annotation>
- <documentation>
- The text description for the element
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlink" type="string">
- <annotation>
- <documentation>
- A hyperlink associated with the element. The hyperlink would normally execute the hyperlinkaction action
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlinkaction" type="string">
- <annotation>
- <documentation>
- The action associated with the hyperlink. This is an action that will be executed when the hyperlink is selected
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="actionparameters" type="string">
- <annotation>
- <documentation>
- Can be used to pass one or more parameters to the hyperlink action. Parameter must be space separated (optional)
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- &lt;extension
- id=&quot;org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor&quot;
- name=&quot;%pageflow.editor.intro.name&quot;
- point=&quot;org.eclipse.jst.jsf.facesconfig.ui.page.overviewPage&quot;&gt;
- &lt;overviewpage
- name=&quot;%pageflow.editor.intro.name&quot;
- description=&quot;%port.editor.intro.description&quot;&gt;
- &lt;overviewelement
- icon=&quot;icons/pageflow_72.gif&quot;
- heading=&quot;%pageflow.editor.intro.heading&quot;
- text=&quot;%pageflow.editor.intro.description&quot;&gt;
- &lt;/overviewelement&gt;
- &lt;overviewelement
- actionparameters=&quot;Pageflow.designerCheatSheet&quot;
- icon=&quot;icons/tutorials_72.gif&quot;
- hyperlinkaction=&quot;org.eclipse.jst.jsf.common.ui.actions.LoadCheatSheetAction&quot;
- text=&quot;%pageflow.editor.intro.cheatsheets.text&quot;
- hyperlink=&quot;%pageflow.editor.intro.cheatsheets.link&quot;&gt;
- &lt;/overviewelement&gt;
- &lt;overviewelement
- actionparameters=&quot;http://www.eclipse.org&quot;
- icon=&quot;icons/overview_72.gif&quot;
- hyperlinkaction=&quot;org.eclipse.jst.jsf.common.ui.actions.LoadHelpAction&quot;
- text=&quot;%pageflow.editor.intro.help.text&quot;
- hyperlink=&quot;%pageflow.editor.intro.help.link&quot;&gt;
- &lt;/overviewelement&gt;
- &lt;overviewelement
- actionparameters=&quot;overview&quot;
- icon=&quot;icons/gotoeditor_72.gif&quot;
- hyperlinkaction=&quot;org.eclipse.jst.jsf.common.ui.actions.OpenPageAction&quot;
- text=&quot;%pageflow.editor.intro.start.text&quot;
- hyperlink=&quot;%pageflow.editor.intro.start.link&quot;&gt;
- &lt;/overviewelement&gt;
- &lt;/overviewpage&gt;
- &lt;/extension&gt;
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004, 2006 Sybase, Inc. and others. &lt;br&gt;
- All rights reserved. This program and the accompanying materials &lt;br&gt;
- are made available under the terms of the Eclipse Public License v1.0 &lt;br&gt;
- which accompanies this distribution, and is available at &lt;br&gt;
- http://www.eclipse.org/legal/epl-v10.html &lt;br&gt;
-
- Contributors: &lt;br&gt;
- Sybase, Inc. - initial API and implementation &lt;br&gt;
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties
deleted file mode 100644
index 787880cba..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties
+++ /dev/null
@@ -1,113 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-####################################################
-# Generic Strings for UI
-####################################################
-
-pluginName=Web Application Development Common
-button.save=&Save
-button.remove=&Remove
-
-####################################################
-# Resource message for Logging
-####################################################
-
-log.msg={0}
-
-log.ResourceUtils=Missing Resource Bundle "{0}".
-log.CommonPlugin=Web Application Development Common Plugin initialized on eclipse version {0}.
-log.FavoriteConfigurations.save.error=Failed to save {0} favorites. File={1}
-log.FavoriteConfigurations.read.error=Failed to read {0} favorites. File={1}
-log.CommonPlugin.image.error=Image {0} not found.
-
-log.IntroductionSection.action.error = Failed to launch the link {0}
-
-####################################################
-# Resource message for Alerts
-####################################################
-
-alert.msg={0}
-
-####################################################
-# Resource messages for FavoriteSection
-####################################################
-favorites.group.label=Favorite Configurations
-favorites.label=&Name:
-favorites.tooltip=Construct common setting favorites for this page.
-favorites.save.tooltip=Save the current options on this page as the favorites.
-favorites.remove.tooltip=Remove the current favorite.
-favorites.default=default
-
-####################################################
-# Resource messages for Preference Pages
-####################################################
-JMTPreferencePage.Description=Expand the tree to edit Web Application preferences.
-
-LoggingPreferencePage.Log.Level.label=Log Level:
-LoggingPreferencePage.Log.Level.tooltip=Select the logging level to output to the selected source.
-LoggingPreferencePage.Log.Level.debug=Debug
-LoggingPreferencePage.Log.Level.info=Info
-LoggingPreferencePage.Log.Level.warn=Warn
-LoggingPreferencePage.Log.Level.error=Error
-LoggingPreferencePage.Log.Level.fatal=Fatal
-LoggingPreferencePage.Console.Group.label=Console
-LoggingPreferencePage.Console.Logging.label=Enable &Console Logging
-LoggingPreferencePage.Console.Logging.tooltip=Receive log message in the Eclipse Console view.
-LoggingPreferencePage.Eclipse.Group.label=Eclipse
-LoggingPreferencePage.Eclipse.Logging.label=Enable &Eclipse Logging
-LoggingPreferencePage.Eclipse.Logging.tooltip=Receive log message in the Eclipse Error Log view.
-LoggingPreferencePage.File.Group.label=File
-LoggingPreferencePage.File.Logging.label=Enable &File Logging
-LoggingPreferencePage.File.Logging.tooltip=Write log message to an external file.
-LoggingPreferencePage.File.clearing.label=Clear log file on &startup
-LoggingPreferencePage.File.clearing.tooltip=Each time Eclipse starts, clear the log file.
-LoggingPreferencePage.File.path.label=&Log file:
-LoggingPreferencePage.File.path.tooltip=Where should the log file go? Partial paths are \n based from: /workspace/.metadata/.plugins/org.eclipse.jst.jsf.common.ui.internal/.
-LoggingPreferencePage.File.button.label=B&rowse
-LoggingPreferencePage.File.button.tooltip=Select a location and file name for file logging.
-LoggingPreferencePage.File.select.label=Select a log file
-LoggingPreferencePage.File.Rollover.Frequency.label=Rollover Fre&quency:
-LoggingPreferencePage.File.Rollover.Frequency.tooltip=Select the frequency of how often to generate a new log file. \n The original log file is appended with a timestamp.
-LoggingPreferencePage.File.Rollover.Frequency.daily=Daily
-LoggingPreferencePage.File.Rollover.Frequency.weekly=Weekly
-LoggingPreferencePage.File.Rollover.Frequency.monthly=Monthly
-
-####################################################
-# Resource messages for BrowserWindow
-####################################################
-BrowserWindow.back.tooltip=Navigate back in the browser
-BrowserWindow.forward.tooltip=Navigate forward in the browser
-BrowserWindow.stop.tooltip=Stop browser navigation
-BrowserWindow.refresh.tooltip=Refresh the browser
-BrowserWindow.reload.tooltip=Reload the browser
-
-####################################################
-# Resource messages for Commmon DialogField
-####################################################
-DialogField.JavaClassWizard.NewClass=New Java Class
-DialogField.ClassButton.SelectType=Select Type
-DialogField.Browse=Browse...
-DialogField.ResourceButton.SelectFile=Select File
-
-####################################################
-# Resource messages for Commmon Dialog
-####################################################
-Dialog.ResourceOnClasspathDialog.StatusMessage=Select a properties file
-Dialog.CommonResourceDialog.StatusMessage0=Select
-Dialog.TreeViewerSelectionDialog.DefaultTitle=Select a File
-
-Wizards.NewPage.Error.InvalidProject=Invalid Web project.
-Error.FileFilter.title=File selection
-Error.ImgFileFilter.error=File selection error:
-Error.ProjectFileDialogContentProvider=Project file dialog error: {0}
-Error.RefreshingLocal=Refreshing local
-
-Service.NoResourceError=Unable to determine Service Model file.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/ICommonConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/ICommonConstants.java
deleted file mode 100644
index f8ef8b560..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/ICommonConstants.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui;
-
-/**
- * Common constants that would be used through the swad world. This might
- * include file extensions, ids
- *
- * @author mengbo
- */
-public interface ICommonConstants {
- /**
- * These are the defines for the logging preference pages.
- */
- public static final String P_LOGGING = "logging"; // all logging
-
- // preferences will
- // contain this string
- // in the key.
-
- public static final String P_CONSOLE_LOGGING = "console.logging.on";
-
- public static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level";
-
- public static final String P_ECLIPSE_LOGGING = "eclipse.logging.on";
-
- public static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level";
-
- public static final String P_FILE_LOGGING = "file.logging.on";
-
- public static final String P_FILE_LOG_LEVEL = "file.logging.max.level";
-
- public static final String P_FILE_PATH = "file.logging.path";
-
- public static final String P_FILE_CLEAR = "file.logging.startup.clear";
-
- public static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency";
-
- public static final String P_REMOTE_LOGGING = "remote.logging.on";
-
- public static final String P_REMOTE_LOG_LEVEL = "remote.logging.max.level";
-
- public static final String P_REMOTE_HOST = "remote.logging.host";
-
- public static final String P_REMOTE_PORT = "remote.logging.port";
-
- /** Debug levels */
- public static final int DEBUG_LEVEL = 0;
-
- public static final int INFO_LEVEL = 1;
-
- public static final int WARN_LEVEL = 2;
-
- public static final int ERROR_LEVEL = 3;
-
- public static final int FATAL_LEVEL = 4;
-
- /** Rollover Frequency */
- public static final int DAILY_FREQ = 0;
-
- public static final int WEEKLY_FREQ = 1;
-
- public static final int MONTHLY_FREQ = 2;
-
- /** Sybase provided taglib id, defined in plugin.xml */
- public static final String SYBASE_TAGLIB_ID = "category_jsf";
-
- /** DataWindow taglib id, defined in plugin.xml */
- public static final String DATAWINDOW_TAGLIB_ID = "category_datawindow";
-
- /** Soap Service support category id, defined in plugin.xml of jmt */
- public static String SOAP_SERVICE_CATEGORY_ID = "category_soapservice";
-
- /** An nature for jsf based webapp project */
- public static final String NATURE_WEBAPP = "org.eclipse.jst.pagedesigner.WebappNature";
-
- public static final String XML_DECL = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-
- /** default faces-config.xml file, for version 1.0 */
- public static final String FACES_CONFIG_10 = XML_DECL
- + "<!DOCTYPE faces-config PUBLIC \"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN\" \"http://java.sun.com/dtd/web-facesconfig_1_0.dtd\">\n<faces-config/>";
-
- /** default faces-config.xml file, for version 1.1 */
- public static final String FACES_CONFIG_11 = XML_DECL
- + "<!DOCTYPE faces-config PUBLIC \"-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN\" \"http://java.sun.com/dtd/web-facesconfig_1_1.dtd\">\n<faces-config/>";
-
- /** default web.xml, for version 2.2 */
- public static final String WEBAPP_22 = XML_DECL
- + "<!DOCTYPE web-app PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN\" \"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd\">";
-
- /** default web.xml, for version 2.3 */
- public static final String WEBAPP_23 = XML_DECL
- + "<!DOCTYPE web-app PUBLIC \"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN\" \"http://java.sun.com/dtd/web-app_2_3.dtd\">";
-
- /** default web.xml, for version 2.4 */
- public static final String WEBAPP_24 = XML_DECL
- + "<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"2.4\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd\">";
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java
deleted file mode 100644
index 34cc432f6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IFileFolderConstants {
- public static final String STAR = "*";
-
- public static final String DOT = ".";
-
- public static final String PATH_SEPARATOR = "/";
-
- /** file extensions */
- public static final String EXT_APP = "app";
-
- public static final String EXT_CLASS = "class";
-
- public static final String EXT_DGM = "dgm";
-
- public static final String EXT_GIF = "gif";
-
- public static final String EXT_HTM = "htm";
-
- public static final String EXT_HTML = "html";
-
- public static final String EXT_JAR = "jar";
-
- public static final String EXT_JAVA = "java";
-
- public static final String EXT_JPEG = "jpeg";
-
- public static final String EXT_JPG = "jpg";
-
- public static final String EXT_JSF = "jsf";
-
- public static final String EXT_JSP = "jsp";
-
- public static final String EXT_JSV = "jsv";
-
- public static final String EXT_JTPL = "jtpl";
-
- public static final String EXT_JSPX = "jspx";
-
- public static final String EXT_PAGEFLOW = "pageflow";
-
- public static final String EXT_PBD = "pbd";
-
- public static final String EXT_PBL = "pbl";
-
- public static final String EXT_PNG = "png";
-
- public static final String EXT_PSR = "psr";
-
- public static final String EXT_PROPERTIES = "properties";
-
- public static final String EXT_PUL = "pul";
-
- public static final String EXT_SRD = "srd";
-
- public static final String EXT_TAGLIB = "tld";
-
- public static final String EXT_TMPL = "tmpl";
-
- public static final String EXT_WAR = "war";
-
- public static final String EXT_XML = "xml";
-
- public static final String EXT_ZIP = "zip";
-
- public static final String EXT_WSDL = "wsdl";
-
- /** files */
- public static final String FILE_BUILD_PROPERTIES = "build.properties";
-
- public static final String FILE_FACES_CONFIG_XML = "faces-config.xml";
-
- public static final String FILE_MANIFEST_MF = "MANIFEST.MF";
-
- public static final String FILE_WEB_APP_23_DTD = "web-app_2_3.dtd";
-
- public static final String FILE_WEB_FACESCONFIG_10_DTD = "web-facesconfig_1_0.dtd";
-
- public static final String FILE_WEB_XML = "web.xml";
-
- public static final String FILE_SYBASE_EASERVER_CONFIG_XML = "sybase-easerver-config.xml";
-
- /** folders */
- public static final String FOLDER_BIN = "bin";
-
- public static final String FOLDER_CLASS = "classes";
-
- public static final String FOLDER_DTD = "dtd";
-
- public static final String FOLDER_GENERATED = "generated";
-
- public static final String FOLDER_ICONS = "icons";
-
- public static final String FOLDER_IMAGES = "images";
-
- public static final String FOLDER_LIB = "lib";
-
- public static final String FOLDER_METAINF = "META-INF";
-
- public static final String FOLDER_PAGEFLOW = "pageflows";
-
- public static final String FOLDER_PB = "pb";
-
- public static final String FOLDER_SOURCE = "src";
-
- public static final String FOLDER_TEMPLATES = "templates";
-
- public static final String FOLDER_TAGLIB = "tld";
-
- public static final String FOLDER_WEBINF = "WEB-INF";
-
- public static final String FOLDER_WEBROOT = "WebContent";
-
- public static final String FOLDER_WIZARDS = "wizards";
-
- public static final String FOLDER_WSDL = "wsdl";
-
- /** the webroot folder depth relative to the project */
- public static final int WEBROOT_FOLDER_DEPTH = 2;
-
- /**
- * @deprecated
- */
- public static String DEFAULT_FACES_CONFIG_FILE_PATH = IFileFolderConstants.PATH_SEPARATOR
- + IFileFolderConstants.FOLDER_WEBROOT
- + IFileFolderConstants.PATH_SEPARATOR
- + IFileFolderConstants.FOLDER_WEBINF
- + IFileFolderConstants.PATH_SEPARATOR
- + IFileFolderConstants.FILE_FACES_CONFIG_XML;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java
deleted file mode 100644
index 8a82e5f25..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSFUICommonPlugin extends AbstractUIPlugin implements ICommonConstants {
- // Properties contains general properties and defaults to preferences.
- private static final String PROPERTIES = "default.properties";
-
- // What version of the platform are we on.
- private static boolean TWO_DOT_ONE;
-
- private static boolean THREE_DOT;
-
- private static String _version;
-
- // The shared instance.
- private static JSFUICommonPlugin _plugin;
-
- private Logger _log;
-
- private ResourceBundle _resourceBundle;
-
- private Properties _properties;
-
- private URL _pluginBase;
-
- private static Alerts _alerts;
-
- /**
- * The constructor.
- */
- public JSFUICommonPlugin() {
- super();
- _plugin = this;
- versionCheck();
- }
-
- private void versionCheck() {
- String version = (String) ResourcesPlugin.getPlugin().getBundle()
- .getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
- Version identifier = new Version(version);
-
- TWO_DOT_ONE = ((identifier.getMajor() == 2) && (identifier
- .getMinor() == 1));
- THREE_DOT = (identifier.getMajor() == 3);
- _version = identifier.toString();
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
-
- // This plugin is for 3.0 only, do a version check.
- if (isThreeDot() == false) {
- throw new CoreException(new Status(IStatus.ERROR, getBundle()
- .getSymbolicName(), IStatus.OK,
- "Requires eclipse version 3.x", null));
- }
-
- try {
- // get resource bundle.
- _resourceBundle = ResourceBundle
- .getBundle("org.eclipse.jst.jsf.common.ui.CommonResources");
- _alerts = new Alerts(this, _resourceBundle);
-
- // get properties.
- _properties = new Properties();
- InputStream input = null;
- _pluginBase = getBundle().getEntry("/");
- try {
- input = (new URL(_pluginBase, PROPERTIES)).openStream();
- _properties.load(input);
- } finally {
- try {
- input.close();
- } catch (IOException ee)// NOPMD
- {
- // nothing to do when IOException throwed in closing files.
- }
- }
-
- // set up logging for this plugin and everthing under it.
- _log = new Logger(this.getBundle(), _resourceBundle);
-
- // NOTE: add in any other plugin code statup HERE!!!!
-
- // log.CommonPlugin=Web Application Development Common Plugin
- // initialized on eclipse version {0}.
-
- // log.info("log.CommonPlugin", version);
-
- } catch (Exception ee) {
- // only log if the logger was configured correctly.
- if (_log != null) {
- _log
- .error(
- "log.msg",
- "Problems starting plug-in Web Application Development Common.",
- ee);
- }
-
- throw new CoreException(
- new Status(
- IStatus.ERROR,
- getBundle().getSymbolicName(),
- IStatus.OK,
- "Problems starting plug-in Web Application Development Common",
- ee));
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static JSFUICommonPlugin getDefault() {
- return _plugin;
- }
-
- /**
- * get the alerts objects associated with this plugin for alerting the user.
- *
- * @return the alerts object
- */
- public static Alerts getAlerts() {
- return _alerts;
- }
-
- /**
- * Returns a logger for the new class using this plugin for reference.
- */
- // TODO: theClass is never used!!
- public static Logger getLogger(Class theClass) {
- return getDefault().getRootLogger();
- }
-
- /**
- * Returns the plugin's root logger
- */
- public Logger getRootLogger() {
- return _log;
- }
-
- /**
- * Returns this plugin's unique identifier
- *
- * @retun this plugin's unique identifier
- *
- */
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- /**
- * 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 = JSFUICommonPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's descriptor's resource bundle,
- */
- public ResourceBundle getPluginDecriptorBundle() {
- return Platform.getResourceBundle(getDefault().getBundle());
- }
-
- /**
- * Returns the plugin's default properties. These are normally used for
- * default preferences.
- */
- public Properties getProperties() {
- return _properties;
- }
-
- /**
- * 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 workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * 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 = 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.CommonPlugin.image.error=Image {0} not found.
- _log.error("log.msg", "log.CommonPlugin.image.error", name, ee);
- }
- }
- return image;
- }
-
- /**
- * Returns a shared ImageDescriptor for the given name
- * <p>
- * Note: ImageDescriptor returned from this method will be automitically
- * disposed of when this plug-in shuts down. Callers must not dispose of
- * these ImageDescriptor themselves.
- * </p>
- *
- * @param name
- * the ImageDescriptor name found in /icons (with extension)
- * @return the ImageDescriptor, null on error or not found.
- */
- public ImageDescriptor getImageDescriptor(String name) {
- if (name == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- ImageDescriptor id = images.getDescriptor(name);
- if (id == null) {
- try {
- id = ImageDescriptor.createFromURL(new URL(_pluginBase,
- "icons/" + name));
- images.put(name, id);
- } catch (MalformedURLException ee) {
- // log.CommonPlugin.image.error=Image {0} not found.
- _log.error("log.msg", "log.CommonPlugin.image.error", name, ee);
- }
- }
- return id;
- }
-
- /**
- * Read a file resource. The file should contain any partial path and the
- * filename from the plugin base. The caller is responsible for closing the
- * file.
- */
- public InputStream readFile(String file) throws MalformedURLException,
- IOException {
- return (new URL(_pluginBase, file)).openStream();
- }
-
- /**
- * Is this eclipse version 2.1
- *
- * @return true if version is 2.1
- */
- public static boolean isTwoDotOne() {
- return TWO_DOT_ONE;
- }
-
- /**
- * Is this eclipse version 3.x
- *
- * @return true if version is 3.x
- */
- public static boolean isThreeDot() {
- return THREE_DOT;
- }
-
- /**
- * get the eclipse version
- *
- * @return version string.
- */
- public static String getVersion() {
- return _version;
- }
-
- /**
- * 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;
- }
- return getDefault().getWorkbench().getActiveWorkbenchWindow();
- }
-
- /**
- * 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();
- }
-
- /**
- * Initializes the preference controls to the default values. These values
- * are used the first time the preference page is displayed or when the user
- * presses the Defaults button in the preferences page.
- */
- protected void initializeDefaultPreferences(IPreferenceStore store) {
- // NOTE: no logging can happen here since we haven't initialized logging
- // yet because it
- // depends on preferences!!!!
-
- store.setDefault(P_CONSOLE_LOGGING, _properties.getProperty(
- P_CONSOLE_LOGGING, Boolean.TRUE.toString()));
- store.setDefault(P_CONSOLE_LOG_LEVEL, strToIntLogLevel(_properties
- .getProperty(P_CONSOLE_LOG_LEVEL, "ERROR")));
-
- store.setDefault(P_ECLIPSE_LOGGING, _properties.getProperty(
- P_ECLIPSE_LOGGING, Boolean.TRUE.toString()));
- store.setDefault(P_ECLIPSE_LOG_LEVEL, strToIntLogLevel(_properties
- .getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR")));
-
- store.setDefault(P_FILE_LOGGING, _properties.getProperty(
- P_FILE_LOGGING, Boolean.FALSE.toString()));
- store.setDefault(P_FILE_LOG_LEVEL, strToIntLogLevel(_properties
- .getProperty(P_FILE_LOG_LEVEL, "ERROR")));
- store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, ""));
- store.setDefault(P_FILE_CLEAR, _properties.getProperty(P_FILE_CLEAR,
- Boolean.TRUE.toString()));
- store.setDefault(P_FILE_ROLLOVER_FREQUENCY, _properties.getProperty(
- P_FILE_ROLLOVER_FREQUENCY, "DAILY"));
- }
-
- /**
- * Converts the log level from string to int. The level defaults to
- * ERROR_LEVEL.
- *
- * @param str
- * String representation of log level
- * @return integer representation of log level
- */
- private int strToIntLogLevel(String str) {
- if (str == null) {
- return ERROR_LEVEL;
- }
- if (str.equalsIgnoreCase("DEBUG")) {
- return DEBUG_LEVEL;
- }
- if (str.equalsIgnoreCase("INFO")) {
- return INFO_LEVEL;
- }
- if (str.equalsIgnoreCase("WARN")) {
- return WARN_LEVEL;
- }
- if (str.equalsIgnoreCase("FATAL")) {
- return FATAL_LEVEL;
- }
- return ERROR_LEVEL;
- }
-
- /**
- * Converts the rollover frequency from string to int. The frequency
- * defaults to DAILY.
- *
- * @param str
- * String representation of rollover frequency
- * @return integer representation of rollover frequency
- */
- public int strToIntFrequency(String str) {
- if (str == null) {
- return DAILY_FREQ;
- }
- if (str.equalsIgnoreCase("WEEKLY")) {
- return WEEKLY_FREQ;
- }
- if (str.equalsIgnoreCase("MONTHLY")) {
- return MONTHLY_FREQ;
- }
- return DAILY_FREQ;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.java
deleted file mode 100644
index 8456083ed..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.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.common.ui.internal.actions;
-
-/**
- * Editors should implement this if they can handle reseting to a page based on
- * the class defined for that page.
- *
- * @author collinsc,jchoi
- */
-public interface IOpenPage {
- /**
- * Sets the currently active page from the id of the page.
- *
- * @param pageID
- */
- public void setActiveEditorPage(String pageID);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java
deleted file mode 100644
index de7406f7c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.cheatsheets.OpenCheatSheetAction;
-
-/**
- * This class is used to open the cheat sheet based on the configuration
- * parameter.
- *
- * @author mengbo
- */
-public class LoadCheatSheetAction extends Action implements
- IExecutableExtension {
- private String _cheatSheetName = null;
-
- /**
- *
- */
- public LoadCheatSheetAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- if (_cheatSheetName != null) {
- OpenCheatSheetAction action = new OpenCheatSheetAction(
- _cheatSheetName);
- action.run();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) throws CoreException {
- _cheatSheetName = config.getAttribute("actionparameters"); //$NON-NLS-1$
- }
-
- /**
- * set the cheatSheetName name to open.
- *
- * @param cheatSheetName
- */
- public void setCheatSheetName(String cheatSheetName) {
- _cheatSheetName = cheatSheetName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java
deleted file mode 100644
index 18b927d2b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class is used to open the help page for a configuration param.
- *
- * @author mengbo
- */
-public class LoadHelpAction extends Action implements IExecutableExtension {
- private String _helpContextId = null;
-
- /**
- *
- */
- public LoadHelpAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- IContext context = HelpSystem.getContext(_helpContextId);
- if (context != null) {
- IHelpResource[] topics = context.getRelatedTopics();
- if (topics != null && topics.length == 1) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(
- topics[0].getHref());
- } else {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(
- _helpContextId);
- }
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) throws CoreException {
- _helpContextId = config.getAttribute("actionparameters"); //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.java
deleted file mode 100644
index 252e44caf..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.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.common.ui.internal.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * This class is used to open a page in the editor based on the configuration
- * parameter.
- *
- * @author collinsc,jchoi
- */
-public class OpenPageAction extends Action implements IExecutableExtension {
- private String pageID = null;
-
- private ISelection selection;
-
- /**
- *
- */
- public OpenPageAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- if (pageID != null) {
- // get the active editor
- IEditorPart editor = getActiveEditor();
- IOpenPage openPage = (IOpenPage)editor.getAdapter(IOpenPage.class);
- if(openPage != null){
- openPage.setActiveEditorPage(pageID);
- if (selection != null && editor instanceof FormEditor) {
- IEditorPart activePage = ((FormEditor) editor)
- .getActiveEditor();
- if (activePage instanceof ISelectionProvider) {
- ((ISelectionProvider) activePage)
- .setSelection(selection);
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) throws CoreException {
- pageID = config.getAttribute("actionparameters"); //$NON-NLS-1$
- }
-
- /**
- * set the class name to open.
- * @param className
- */
- public void setPageName(String className) {
- this.pageID = className;
- }
-
- /**
- * get the current active editor
- *
- * @return the active editor part
- */
- public static IEditorPart getActiveEditor() {
- IEditorPart editor = null;
- IWorkbenchWindow win = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- if (win != null) {
- IWorkbenchPage page = win.getActivePage();
- if (page != null) {
- editor = page.getActiveEditor();
- }
- }
- return editor;
- }
-
- /**
- * @return stored selection
- */
- public ISelection getSelection() {
- return selection;
- }
-
- /**
- * @param selection
- */
- public void setSelection(ISelection selection) {
- this.selection = selection;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java
deleted file mode 100644
index d73a28d14..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public abstract class AbstractClassButtonDialogField extends
- StringButtonDialogField {
- private IProject _project;
-
- private String _superClass;
-
- private List _interfacesList;
-
- private IType _type;
-
- private int _typeFlag = IJavaElementSearchConstants.CONSIDER_ALL_TYPES;
-
- private boolean _autoOpenResource = true;
-
- public void setAutoOpenResource(boolean autoOpenResource) {
- _autoOpenResource = autoOpenResource;
- }
-
- public AbstractClassButtonDialogField(IProject project) {
- super(null);
- this._project = project;
-
- setHyperLink(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- activeLink();
- }
- });
-
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- browseButtonPressed();
- }
- });
- }
-
- private void activeLink() {
- String className = getText();
- className = trimNonAlphaChars(className);
- if (className.length() > 0
- && JavaUIHelper.doesClassExist(_project, className)) {
- JavaUIHelper.doOpenClass(_project, className);
- } else {
- try {
- if (_project == null || !_project.hasNature(JavaCore.NATURE_ID)) {
- ResourceBundle rb = ResourceBundle
- .getBundle("org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldResources");
- Alerts alerts = new Alerts(JSFUICommonPlugin.getDefault(), rb);
- alerts.error("ClassButtonDialogField.Alert.Title",
- "ClassButtonDialogField.Alert.Msg");
- return;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- return;
- }
- JavaClassWizard wizard = new JavaClassWizard(_project, className,
- _superClass, getImplementInterfaces());
- wizard.setAutoOpenResource(_autoOpenResource);
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.create();
-
- setDialogSize(dialog, 400, 500);
- if (dialog.open() == WizardDialog.OK) {
- String newValue = wizard.getClassNameWithArgs();
- if (!newValue.equals(className)) {
- setText(newValue);
- }
- }
- }
- }
-
- protected abstract List getImplementInterfaces();
-
- protected abstract IJavaSearchScope getJavaSearchScope();
-
- private void browseButtonPressed() {
- Shell shell = getShell();
- SelectionDialog dialog = JavaUIHelper.openSelectionDialog(shell,
- getJavaSearchScope(), _typeFlag);
- dialog.setTitle(JSFUICommonPlugin
- .getResourceString("DialogField.ClassButton.SelectType"));//$NON-NLS-1$
-
- if (dialog.open() == SelectionDialog.OK) {
- String oldClassName = getText();
- if (dialog.getResult() != null) {
- _type = (IType) dialog.getResult()[0];
- String newClassName = _type.getFullyQualifiedName();
- if (!oldClassName.equals(newClassName)) {
- setText(newClassName);
- }
- }
- }
- }
-
- private void setDialogSize(Dialog dialog, int width, int height) {
- Point computedSize = dialog.getShell().computeSize(SWT.DEFAULT,
- SWT.DEFAULT);
- width = Math.max(computedSize.x, width);
- height = Math.max(computedSize.y, height);
- dialog.getShell().setSize(width, height);
- }
-
- private String trimNonAlphaChars(String className) {
- className = className.trim();
- while (className.length() > 0
- && !Character.isLetter(className.charAt(0))) {
- className = className.substring(1, className.length());
- }
- int loc = className.indexOf(":"); //$NON-NLS-1$
- if (loc != -1 && loc > 0) {
- className = className.substring(0, loc);
- } else if (loc == 0) {
- className = ""; //$NON-NLS-1$
- }
- return className;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-
- /**
- * @return Returns the superClassName.
- */
- public String getSuperClassName() {
- return _superClass;
- }
-
- /**
- * @param superClassName
- * The superClassName to set.
- */
- public void setSuperClassName(String superClassName) {
- this._superClass = superClassName;
- }
-
- /**
- * @return Returns the interfacesList.
- */
- protected List getInterfacesList() {
- return _interfacesList;
- }
-
- public void setInterface(String interfaceName) {
- _interfacesList = new ArrayList();
- _interfacesList.add(interfaceName);
- }
-
- /**
- * @param interfacesList
- * The interfacesList to set.
- */
- public void setInterfacesList(List interfacesList) {
- // TODO:Now we can not find the IJavaSearchScope that support the
- // Hierarchies for multi-types.
- // We will support the multi-interfaces After resolve the problem.
- this._interfacesList = interfacesList;
- }
-
- /**
- * @return Returns the _type.
- */
- public IType getType() {
- return _type;
- }
-
- /**
- * @return Returns the typeFalg.
- */
- public int getTypeFlag() {
- return _typeFlag;
- }
-
- /**
- * @param typeFalg
- * The typeFalg to set.
- */
- public void setTypeFlag(int typeFalg) {
- this._typeFlag = typeFalg;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/BooleanComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/BooleanComboDialogField.java
deleted file mode 100644
index b40bdaef7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/BooleanComboDialogField.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-
-/**
- * @author mengbo
- */
-public class BooleanComboDialogField extends ComboDialogField {
- final public static int USE_YESNO = 0;
-
- final public static int USE_TRUEFALSE = 1;
-
- /**
- *
- * @param type
- */
- public void setType(int type) {
- if (type == USE_YESNO) {
- setItems(new String[] { "", "yes", "no" });
- } else if (type == USE_TRUEFALSE) {
- setItems(new String[] { "", "true", "false" });
- }
- }
-
- /**
- * @param flags
- */
- public BooleanComboDialogField(int flags) {
- super(flags);
- setType(USE_TRUEFALSE);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java
deleted file mode 100644
index baed42bb5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-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.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-/**
- * @author mengbo
- */
-public class ClassButtonDialogField extends AbstractClassButtonDialogField {
- /**
- * @param project
- */
- public ClassButtonDialogField(IProject project) {
- super(project);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#getImplementInterfaces()
- */
- protected List getImplementInterfaces() {
- return getInterfacesList();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#getJavaSearchScope()
- */
- protected IJavaSearchScope getJavaSearchScope() {
- IJavaSearchScope scope;
- String superType = getSuperClassName();
- List interfaceList = getInterfacesList();
- if (superType == null && interfaceList != null
- && interfaceList.size() > 0) {
- superType = interfaceList.get(0).toString();
- }
- if (getSuperClassName() != null && interfaceList != null
- && interfaceList.size() > 0) {
- superType = null;
- }
- if (superType == null) {
- scope = SearchEngine
- .createJavaSearchScope(new IJavaProject[] { JavaCore
- .create(getProject()) });
- } else {
- scope = JavaUIHelper.findSearchScope(getProject(), superType);
- }
- return scope;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClasspathResourceButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClasspathResourceButtonDialogField.java
deleted file mode 100644
index a02a94f26..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClasspathResourceButtonDialogField.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.dialogs.ResourceOnClasspathDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author mengbo
- */
-public class ClasspathResourceButtonDialogField extends StringButtonDialogField {
- private IProject _project;
-
- private static final String[] PROPERTIES_FILES_SUFFIXS = new String[] { IFileFolderConstants.EXT_PROPERTIES }; //$NON-NLS-1$
-
- public ClasspathResourceButtonDialogField(IProject project) {
- this(null, project);
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- browseButtonPressed();
- }
- });
- }
-
- public ClasspathResourceButtonDialogField(IStringButtonAdapter adapter,
- IProject project) {
- super(adapter);
- this._project = project;
- }
-
- private void browseButtonPressed() {
- Shell shell = getShell();
- ResourceOnClasspathDialog dialog = new ResourceOnClasspathDialog(shell,
- getJavaProject());
- dialog.setTitle(JSFUICommonPlugin
- .getResourceString("DialogField.ResourceButton.SelectFile"));//$NON-NLS-1$
- dialog.setSuffixs(PROPERTIES_FILES_SUFFIXS);
- if (dialog.open() == Window.OK) {
- String oldValue = getText();
-
- String newValue = (String) dialog.getResult()[0];
- if (oldValue != newValue) {
- setText(newValue);
- }
- }
- }
-
- private IJavaProject getJavaProject() {
- try {
- if (_project != null && _project.hasNature(JavaCore.NATURE_ID)) {
- return JavaCore.create(_project);
- }
- return null;
- } catch (CoreException e) {
- return null;
- }
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java
deleted file mode 100644
index 95eca3026..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.ui.internal.utils.StyleCombo;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This class provides a common color choice DialogFiled.
- *
- * @author mengbo
- */
-public class ColorButtonDialogField extends StyleComboDialogField {
- // color selection button
- private Button _button;
-
- // the button enable flag
- private boolean _buttonEnabled;
-
- // the current color
- private Color _color;
-
- // the current color RGB
- private RGB _colorValue;
-
- // the combo control
- private StyleCombo _combo;
-
- // when no color is set or selected, using the empty image
- private Image _emptyImage;
-
- // size of color image
- private Point _extent;
-
- // the color image
- private Image _image;
-
- private ColorPalette _colorPalette;
-
- public ColorButtonDialogField(int flags, ColorPalette colorPalette) {
- super(flags);
- _buttonEnabled = true;
- _colorPalette = colorPalette;
- }
-
- private void buttonPressed() {
- ColorDialog colorDialog = new ColorDialog(_button.getShell());
- colorDialog.setRGB(_colorValue);
- RGB newColor = colorDialog.open();
- if (newColor != null && !newColor.equals(_colorValue)) {
- _colorValue = newColor;
- setText(ColorPalette.getStringColor(newColor));
- updateColorImage();
- }
- }
-
- /**
- * Compute the size of the image to be displayed.
- *
- * @param window -
- * the window used to calculate
- * @return <code>Point</code>
- */
- private Point computeImageSize(Control window) {
- GC gc = new GC(window);
- Font f = _button.getFont();
- gc.setFont(f);
- int height = gc.getFontMetrics().getHeight();
-
- Point p = new Point(height * 3 - 6, height - 2);
- gc.dispose();
- return p;
- }
-
- private void disposeResources() {
- if (_image != null) {
- _image.dispose();
- _image = null;
- }
- if (_emptyImage != null) {
- _emptyImage.dispose();
- _emptyImage = null;
- }
- if (_color != null) {
- _color.dispose();
- _color = null;
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#doFillIntoGrid(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite, int)
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- StyleCombo combo = getComboControl(toolkit, parent);
- combo.setLayoutData(gridDataForCombo(nColumns - 3));
-
- _button = getChangeControl(toolkit, parent);
- _button.setLayoutData(gridDataForButton(1));
-
- return new Control[] { requiredLabel, label, combo, _button };
- }
-
- /**
- * Sets the enable state of the button.
- */
- public void enableButton(boolean enable) {
- if (isOkToUse(_button)) {
- _button.setEnabled(isEnabled() && enable);
- }
- _buttonEnabled = enable;
- }
-
- /**
- * Creates or returns the created buttom widget.
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- */
- public Button getChangeControl(FormToolkit toolkit, Composite parent) {
- if (_button == null) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _button = toolkit.createButton(parent, "", SWT.PUSH);
- } else {
- _button = new Button(parent, SWT.PUSH);
- }
- _button.setEnabled(isEnabled() && _buttonEnabled);
-
- _button.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- buttonPressed();
- }
-
- public void widgetSelected(SelectionEvent e) {
- buttonPressed();
- }
- });
-
- _button.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent event) {
- disposeResources();
- }
- });
-
- _extent = computeImageSize(parent);
- _image = new Image(parent.getDisplay(), _extent.x, _extent.y);
- _emptyImage = new Image(parent.getDisplay(), _extent.x, _extent.y);
- initEmptyImage(_button);
- updateColorImage();
- }
-
- return _button;
- }
-
- private String[] getColorList() {
- Map map = _colorPalette.getExtendedColorMap();
- List list = new ArrayList(map.keySet());
- Collections.sort(list);
- return (String[]) list.toArray(new String[list.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField#getTextControl(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public StyleCombo getComboControl(FormToolkit toolkit, Composite parent) {
-
- if (_combo == null) {
- _combo = super.getComboControl(toolkit, parent);
-
- _combo.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- updateImageAfterChanged();
- }
-
- public void widgetSelected(SelectionEvent e) {
- updateImageAfterChanged();
- }
- });
- _combo.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- updateImageAfterChanged();
- }
- });
- _combo.setItems(getColorList());
- }
- return _combo;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#getNumberOfControls()
- */
- public int getNumberOfControls() {
- return 4;
- }
-
- public StyleCombo getTextControl(FormToolkit toolkit, Composite parent) {
- return getComboControl(toolkit, parent);
- }
-
- protected GridData gridDataForButton(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.widthHint = LayoutUtil.getButtonWidthHint(_button);
- gd.heightHint = _combo.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
- return gd;
- }
-
- private void initEmptyImage(Control parent) {
- Color transparentColor = parent.getForeground();
- ImageData imageData = _emptyImage.getImageData();
- imageData.transparentPixel = 0;
- GC gc = new GC(_emptyImage);
- gc.setBackground(transparentColor);
- gc.fillRectangle(0, 0, _emptyImage.getBounds().width, _emptyImage
- .getBounds().height);
- }
-
- /**
- * Set the current color value and update the control.
- *
- * @param rgb
- * The new color.
- */
- public void setColorValue(RGB rgb) {
- _colorValue = rgb;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField#setTextWithoutUpdate(java.lang.String)
- */
- public void setTextWithoutUpdate(String text) {
- super.setTextWithoutUpdate(text);
- updateImageAfterChanged();
- }
-
- /**
- * Update the image being displayed on the button using the current color
- * setting.
- */
- protected void updateColorImage() {
- if (_button.isDisposed()) {
- return;
- }
-
- if (_colorValue == null) {
- _button.setImage(_emptyImage);
- return;
- }
-
- Display display = _button.getDisplay();
- GC gc = new GC(_image);
- gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
- gc.drawRectangle(0, 0, _extent.x - 1, _extent.y - 1);
- if (_color != null) {
- _color.dispose();
- }
- _color = new Color(display, _colorValue);
- gc.setBackground(_color);
- gc.fillRectangle(1, 1, _extent.x - 2, _extent.y - 2);
- gc.dispose();
- _button.setImage(_image);
- }
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_button)) {
- _button.setEnabled(isEnabled() && _buttonEnabled);
- }
- }
-
- private void updateImageAfterChanged() {
- String newColor = getText().trim();
- setColorValue(_colorPalette.getExtendedColorRGB(newColor));
- updateColorImage();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java
deleted file mode 100644
index 59079bef1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * Defines a two sets: one of basic and one of extended colors. Clients extending
- * this class must provide the two maps
- *
- * @author cbateman
- *
- */
-public abstract class ColorPalette
-{
- /**
- * @param cssText
- * @return the basic color matching the cssText key or null if color doesn't exist
- */
- public final Color getBasicColor(String cssText) {
- return (Color) getBasicColorMap().get(cssText.toLowerCase());
- }
-
- /**
- * @param cssText
- * @return the extended color matching the cssText key or null if color doesn't exist
- */
- public final Color getExtendedColor(String cssText) {
- Set keys = getExtendedColorMap().keySet();
- for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
- String key = (String) iterator.next();
- if (key.equalsIgnoreCase(cssText)) {
- return (Color) getExtendedColorMap().get(key);
- }
- }
- return null;
- }
-
- /**
- * @return the map of basic colors where the key is the color name (a string)
- * and the value is an RGB object
- */
- public abstract Map getBasicColorMap();
-
- /**
- * @return the map of extended colors where the key is the color name (a string)
- * and the value is an Color object
- */
- public abstract Map getExtendedColorMap();
-
- /**
- * @param textColor
- * @return same as getExtendedColor but returns value as an RGB object
- */
- public final RGB getExtendedColorRGB(String textColor) {
- if (textColor == null || textColor.length() == 0) {
- return null;
- }
-
- Color color = getExtendedColor(textColor);
- if (color != null) {
- return color.getRGB();
- }
-
- if (textColor.charAt(0) == '#' && textColor.length() == 4) {
- char[] rgbChars = textColor.toCharArray();
- char[] fullChars = { rgbChars[0], rgbChars[1], rgbChars[1],
- rgbChars[2], rgbChars[2], rgbChars[3], rgbChars[3] };
-
- textColor = String.valueOf(fullChars);
- }
-
- if (textColor.charAt(0) == '#' && textColor.length() == 7) {
- try {
- int intColor = Integer.decode(textColor).intValue();
-
- if (intColor > 0xFFFFFF || intColor < 0) {
- return null;
- }
- int r = intColor >> 16;
- int g = (intColor >> 8) & 0xFF;
- int b = intColor & 0xFF;
- return new RGB(r, g, b);
-
- } catch (NumberFormatException e) {
- return null;
- }
- }
- return null;
- }
-
- /**
- * @param rgb
- * @return the hex string for equivalent of the rgb color
- */
- public static String getStringColor(RGB rgb) {
- if (rgb == null) {
- return "";
- }
-
- StringBuffer buffer = new StringBuffer("#");
- int[] intRGBs = new int[] { rgb.red, rgb.green, rgb.blue };
- for (int i = 0; i < 3; i++) {
- if (intRGBs[i] < 16) {
- buffer.append("0");
- }
- buffer.append(Integer.toHexString(intRGBs[i]).toUpperCase());
- }
- return buffer.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
deleted file mode 100644
index 66dd21786..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Map.Entry;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-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.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field containing a label and a combo control.
- *
- * If the combo control is editable, then when user type in the field, will only
- * fire dialogFieldChanged, without dialogFieldApplied just as text control. But
- * when user change selection using the drop down, will fire both
- * dialogFieldChanged and dialogFieldApplied
- *
- * @author mengbo
- */
-public class ComboDialogField extends DialogFieldBase implements
- ISupportTextValue {
- final static private int WIDTH_HINT = 10;
-
- private String _text;
-
- private int _selectionIndex;
-
- private String[] _items;
-
- private CCombo _comboControl;
-
- private ModifyListener _modifyListener;
-
- private int _flags;
-
- private boolean _pending = false;
-
- private Map _entryMap;
-
- public ComboDialogField(int flags) {
- super();
- _text = ""; //$NON-NLS-1$
- _items = new String[0];
- _flags = flags;
- _selectionIndex = -1;
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- CCombo combo = getComboControl(toolkit, parent);
- combo.setLayoutData(gridDataForCombo(nColumns - 2));
-
- return new Control[] { requiredLabel, label, combo };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- protected static GridData gridDataForCombo(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.widthHint = WIDTH_HINT;
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_comboControl)) {
- _comboControl.setFocus();
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created combo control.
- *
- * @param parent
- * The parent composite or <code>null</code> when the widget
- * has already been created.
- */
- public CCombo getComboControl(FormToolkit toolkit, Composite parent) {
- if (_comboControl == null) {
- assertCompositeNotNull(parent);
- _modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- doModifyText(e);
- }
- };
- SelectionListener selectionListener = new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- doSelectionChanged(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- handleDefaultSelection(e);
- }
- };
-
- if (toolkit != null) {
- _comboControl = new CCombo(parent, _flags);
- toolkit.adapt(_comboControl);
- } else {
- _comboControl = new CCombo(parent, _flags | SWT.BORDER);
- _comboControl.setBackground(Display.getCurrent()
- .getSystemColor(SWT.COLOR_LIST_BACKGROUND));
- }
-
- // moved up due to 1GEUNW2
- _comboControl.setItems(_items);
- if (_selectionIndex != -1) {
- _comboControl.select(_selectionIndex);
- } else {
- _comboControl.setText(_text);
- }
- _comboControl.setFont(parent.getFont());
- _comboControl.addModifyListener(_modifyListener);
- _comboControl.addSelectionListener(selectionListener);
- _comboControl.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- doFocusLost(e);
- }
- });
- _comboControl.setEnabled(isEnabled());
- _comboControl.setToolTipText(getToolTip());
- }
- return _comboControl;
- }
-
- protected void handleDefaultSelection(SelectionEvent e) {
- // commit value
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- protected void doFocusLost(FocusEvent e) {
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- private void doModifyText(ModifyEvent e) {
- if (isOkToUse(_comboControl)) {
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = true;
- dialogFieldChanged();
- }
-
- private void doSelectionChanged(SelectionEvent e) {
- if (isOkToUse(_comboControl)) {
- _items = _comboControl.getItems();
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_comboControl)) {
- _comboControl.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Gets the combo items.
- */
- public String[] getItems() {
- return _items;
- }
-
- /**
- * Sets the combo items. Triggers a dialog-changed event.
- */
- public void setItems(String[] items) {
- _items = items;
- if (isOkToUse(_comboControl)) {
- _comboControl.setItems(items);
- }
- _pending = false;
- // dialogFieldChangedAndApplied();
- }
-
- public void setEntryMap(Map map) {
- _entryMap = map;
- if (_entryMap == null) {
- _entryMap = new TreeMap();
- }
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- String[] items = new String[entries.length];
- for (int i = 0; i < entries.length; i++) {
- items[i] = entries[i].getValue().toString();
- }
- setItems(items);
- }
-
- /**
- * Gets the text.
- */
- public String getText() {
- return _text;
- }
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setText(String text) {
- setTextWithoutUpdate(text);
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Selects an item.
- */
- public void selectItem(int index) {
- if (isOkToUse(_comboControl)) {
- _comboControl.select(index);
- } else {
- if (index >= 0 && index < _items.length) {
- _text = getEntryKey(_items[index]);
- _selectionIndex = index;
- }
- }
- dialogFieldChangedAndApplied();
- }
-
- public int getSelectionIndex() {
- return _selectionIndex;
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setTextWithoutUpdate(String text) {
- _pending = false;
- if (text == null) {
- text = "";//$NON-NLS-1$
- }
- _text = text;
- if (isOkToUse(_comboControl)) {
- _comboControl.removeModifyListener(_modifyListener);
- _comboControl.setText(getEntryValue(text));
- _comboControl.addModifyListener(_modifyListener);
- }
- }
-
- private String getEntryValue(String key) {
- if (_entryMap == null || !_entryMap.containsKey(key)) {
- return key;
- }
- return _entryMap.get(key).toString();
- }
-
- private String getEntryKey(String value) {
- if (_entryMap == null || !_entryMap.containsValue(value)) {
- return value;
- }
-
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getValue() == value
- || (value != null && value.equals(entries[i].getValue()))) {
- return entries[i].getKey().toString();
- }
- }
- return value;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(_comboControl, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
deleted file mode 100644
index fe4029191..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface DialogField {
- /**
- * this method must be called directly after constructor, in this case,
- * system will create a hyper link label, and when the hyper link is
- * clicked, the corresponding method on the listene will be called. A
- * RuntimeException will throw out if this method is called after the label
- * has been created.
- *
- * @param listener
- * can't be null
- */
- public abstract void setHyperLink(IHyperlinkListener listener);
-
- /**
- * Sets the label of the dialog field.
- */
- public abstract void setLabelText(String labeltext);
-
- // ------ change listener
- public abstract void setDialogFieldChangeListener(
- IDialogFieldChangeListener listener);
-
- public abstract void setDialogFieldApplyListener(
- IDialogFieldApplyListener listener);
-
- // ------- focus management
- public abstract boolean setFocus();
-
- // ------- layout helpers
- public abstract Control[] doFillIntoGrid(FormToolkit toolkit,
- Composite parent, int nColumns);
-
- /**
- * Returns the number of columns of the dialog field. To be reimplemented by
- * dialog field implementors.
- */
- public abstract int getNumberOfControls();
-
- // ------- ui creation
- public abstract Control getLabelControl(FormToolkit _formToolkit,
- Composite parent);
-
- // --------- enable / disable management
- public abstract void setEnabled(boolean enabled);
-
- /**
- * Gets the enable state of the dialog field.
- */
- public abstract boolean isEnabled();
-
- /**
- * Get attached data by key.
- *
- * @param key
- * @return the attached data object for key
- */
- public abstract Object getAttachedData(Object key);
-
- /**
- * You can attach any data to the DialogField, and get it using the
- * <code>getAttachedData</code> method.
- *
- * @param key
- * @param value
- */
- public abstract void putAttachedData(Object key, Object value);
-
- /**
- * this method give the DialogField a chance to set the correct column to
- * grab horizontal space. In the implementation of this method, should only
- * change the GridData of control, should not do anything else.
- *
- * The caller is responsible to make sure the controls for the dialog field
- * has been created before calling this method.
- */
- public abstract void handleGrabHorizontal();
-
- public abstract boolean isRequired();
-
- public abstract void setToolTip(String toolTip);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
deleted file mode 100644
index bfc56d41c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * Base class of all Dialog fields. Dialog fields manage controls together with
- * the model, independed from the creation time of the widgets. - support for
- * automated layouting. - enable / disable, set focus a concept of the base
- * class. DialogField have a label.
- *
- * DialogField may be used in two different context:
- * <ol>
- * <li> In side dialog. In this case, whenever there is anything change in the
- * dialog field, such as user type anything, the dialog should listen to the
- * dialogFieldChanged() events and do things like validation. When user press
- * the "OK" button, dialog should call getXXX to get the value from the dialog
- * field and apply them.
- * <li> In side form based editor or properties view. In this case, whenever
- * there is anything change in the dialog field, such as user type anything, the
- * editor/view should listen to the dialogFieldChanged() events and do things
- * like validation. When user press "Enter" or move the focus out of the control
- * (finish editing), the dialog field will fire out dialogFieldApplied() events,
- * and the editor/view should listen to this event and apply the value to the
- * underlying model.
- * </ol>
- *
- * The basic idea of the DialogField framework is comming from
- * <code>org.eclipse.jface.preference.FieldEditor</code> and
- * <code>org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField</code>
- *
- * @author mengbo
- */
-public class DialogFieldBase implements DialogField {
- private Label _label;
-
- private Label _requiredLabel;
-
- protected String _labelText;
-
- private IDialogFieldChangeListener _dialogFieldChangeListener;
-
- private IDialogFieldApplyListener _dialogFieldApplyListener;
-
- private boolean _enabled;
-
- private FontMetrics _fontMetrics;
-
- private IHyperlinkListener _listener;
-
- private Hyperlink _hyperlink;
-
- private Map _attachedData;
-
- private boolean _isRequired;
-
- private String toolTip;
-
- public DialogFieldBase() {
- _enabled = true;
- _label = null;
- _requiredLabel = null;
- _hyperlink = null;
- _labelText = ""; //$NON-NLS-1$
- }
-
- /**
- * this method must be called directly after constructor, in this case,
- * system will create a hyper link label, and when the hyper link is
- * clicked, the corresponding method on the listene will be called. A
- * RuntimeException will throw out if this method is called after the label
- * has been created.
- *
- * @param listener
- * can't be null
- */
- public void setHyperLink(IHyperlinkListener listener) {
- if (_label != null) {
- throw new RuntimeException(
- "The Label instance does not support the listener");
- }
- this._listener = listener;
- }
-
- /**
- * Sets the label of the dialog field.
- */
- public void setLabelText(String labeltext) {
- _labelText = labeltext == null ? "" : labeltext;
- // if (_isRequired)
- // {
- // _labelText = "* " + _labelText;
- // }
- // else
- // {
- // _labelText = " " + _labelText;
- // }
- if (_label != null && !_label.isDisposed()) {
- _label.setText(_labelText);
- } else if (_hyperlink != null && !_hyperlink.isDisposed()) {
- _hyperlink.setText(_labelText);
- }
- }
-
- protected Shell getShell() {
- if (_label != null && !_label.isDisposed()) {
- return _label.getShell();
- } else if (_hyperlink != null && !_hyperlink.isDisposed()) {
- return _hyperlink.getShell();
- }
- return null;
- }
-
- // ------ change listener
-
- /**
- * Defines the listener for this dialog field.
- */
- public final void setDialogFieldChangeListener(
- IDialogFieldChangeListener listener) {
- _dialogFieldChangeListener = listener;
- }
-
- public final void setDialogFieldApplyListener(
- IDialogFieldApplyListener listener) {
- _dialogFieldApplyListener = listener;
- }
-
- /**
- * fire both dialogFieldChanged and dialogFieldApplied events.
- */
- public void dialogFieldChangedAndApplied() {
- if (_dialogFieldChangeListener != null) {
- _dialogFieldChangeListener.dialogFieldChanged(this);
- }
- if (_dialogFieldApplyListener != null) {
- _dialogFieldApplyListener.dialogFieldApplied(this);
- }
- }
-
- /**
- * fire dialogFieldChanged event.
- *
- */
- public void dialogFieldChanged() {
- if (_dialogFieldChangeListener != null) {
- _dialogFieldChangeListener.dialogFieldChanged(this);
- }
- }
-
- /**
- * fire dialogFieldApplied event.
- *
- */
- public void dialogFieldApplied() {
- if (_dialogFieldApplyListener != null) {
- _dialogFieldApplyListener.dialogFieldApplied(this);
- }
- }
-
- // ------- focus management
-
- /**
- * Tries to set the focus to the dialog field. Returns <code>true</code>
- * if the dialog field can take focus. To be reimplemented by dialog field
- * implementors.
- */
- public boolean setFocus() {
- return false;
- }
-
- //
- // /**
- // * Posts <code>setFocus</code> to the display event queue.
- // */
- // public void postSetFocusOnDialogField(Display display)
- // {
- // if (display != null)
- // {
- // display.asyncExec(new Runnable()
- // {
- // public void run()
- // {
- // setFocus();
- // }
- // }
- // );
- // }
- // }
-
- // ------- layout helpers
-
- /**
- * Creates all controls of the dialog field and fills it to a composite. The
- * composite is assumed to have <code>MGridLayout</code> as layout. The
- * dialog field will adjust its controls' spans to the number of columns
- * given. To be reimplemented by dialog field implementors.
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(nColumns));
-
- return new Control[] { label };
- }
-
- /**
- * Initializes the computation of horizontal and vertical dialog units based
- * on the size of current font.
- * <p>
- * This method must be called before any of the dialog unit based conversion
- * methods are called.
- * </p>
- *
- * @param control
- * a control from which to obtain the current font
- */
- protected FontMetrics getDialogUnits(Control control) {
- if (_fontMetrics == null) {
- // Compute and store a font metric
- GC gc = new GC(control);
- gc.setFont(control.getFont());
- _fontMetrics = gc.getFontMetrics();
- gc.dispose();
- }
- return _fontMetrics;
- }
-
- /**
- * Returns the number of columns of the dialog field. To be reimplemented by
- * dialog field implementors.
- */
- public int getNumberOfControls() {
- return 1;
- }
-
- protected static GridData gridDataForLabel(int span) {
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = span;
- return gd;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created label widget.
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- */
- public Control getLabelControl(FormToolkit _formToolkit, Composite parent) {
- Control control = null;
- if (_label == null && _hyperlink == null) {
- assertCompositeNotNull(parent);
-
- String label = null;
- if (_labelText != null && !"".equals(_labelText)) {
- //$NON-NLS-1$
- label = _labelText;
- } else {
- label = ".";
- }
-
- if (_listener == null) {
- control = createLabel(_formToolkit, parent, label);
- } else {
- control = createHyperlink(_formToolkit, parent, label);
- }
- /**
- * if(isRequired) { FontData[] fontData =
- * parent.getFont().getFontData(); FontData[] newFontData = new
- * FontData[fontData.length]; for(int i=0; i<fontData.length; i++) {
- * newFontData[i] = new FontData(fontData[i].getName(),
- * fontData[i].getHeight(), fontData[i].getStyle() | SWT.BOLD); }
- * final Font font = new Font(control.getDisplay(),newFontData);
- * control.setFont(font); control.addDisposeListener(new
- * DisposeListener() {
- *
- * public void widgetDisposed(DisposeEvent e) { font.dispose(); }
- * }); } else { control.setFont(parent.getFont()); }
- */
- control.setFont(parent.getFont());
- control.setEnabled(_enabled);
- } else {
- if (_label != null) {
- control = _label;
- } else {
- control = _hyperlink;
- }
- }
- return control;
- }
-
- public Control getRequiredLabelControl(FormToolkit _formToolkit,
- Composite parent) {
- if (_requiredLabel == null) {
- if (_formToolkit == null) {
- _requiredLabel = new Label(parent, SWT.LEFT | SWT.WRAP);
- } else {
- _requiredLabel = _formToolkit.createLabel(parent, "", SWT.LEFT
- | SWT.WRAP);
- _requiredLabel.setForeground(getLabelColor());
- }
- if (_isRequired) {
- _requiredLabel.setText(DialogFieldResources.getInstance()
- .getString("DialogFieldBase.Label.RequiredSymbol"));
- }
- }
- return _requiredLabel;
- }
-
- private Control createLabel(FormToolkit _formToolkit, Composite parent,
- String labelString) {
- if (_formToolkit == null) {
- _label = new Label(parent, SWT.LEFT | SWT.WRAP);
- _label.setText(labelString);
- } else {
- _label = _formToolkit.createLabel(parent, labelString, SWT.LEFT
- | SWT.WRAP);
- _label.setForeground(getLabelColor());
- }
- return _label;
- }
-
- /**
- * get color for lable
- */
- private Color getLabelColor() {
- String osname = System.getProperty("os.name").toLowerCase();
- if (osname.startsWith("mac os")) {
- return Display.getCurrent().getSystemColor(
- SWT.COLOR_LIST_FOREGROUND);
- }
- return Display.getCurrent()
- .getSystemColor(SWT.COLOR_LIST_SELECTION);
- }
-
- private Control createHyperlink(FormToolkit _formToolkit, Composite parent,
- String label) {
- if (_formToolkit == null) {
- _hyperlink = new Hyperlink(parent, SWT.LEFT | SWT.WRAP);
- _hyperlink.setForeground(getLabelColor());
- _hyperlink.setUnderlined(true);
- _hyperlink.addMouseTrackListener(new MouseTrackAdapter() {
-
- public void mouseEnter(MouseEvent e) {
- _hyperlink.setForeground(Display.getCurrent()
- .getSystemColor(SWT.COLOR_BLUE));
- }
-
- public void mouseExit(MouseEvent e) {
- _hyperlink.setForeground(getLabelColor());
- }
- });
- _hyperlink.setText(label);
- } else {
- _hyperlink = _formToolkit.createHyperlink(parent, label, SWT.LEFT
- | SWT.WRAP);
- }
- _hyperlink.addHyperlinkListener(_listener);
- return _hyperlink;
- }
-
- /**
- * Creates a spacer control.
- *
- * @param parent
- * The parent composite
- */
- public Control createEmptySpace(FormToolkit toolkit, Composite parent) {
- return createEmptySpace(toolkit, parent, 1);
- }
-
- /**
- * Creates a spacer control with the given span. The composite is assumed to
- * have <code>MGridLayout</code> as layout.
- *
- * @param parent
- * The parent composite
- */
- public Control createEmptySpace(FormToolkit toolkit, Composite parent,
- int span) {
- Label label;
- if (toolkit != null) {
- label = toolkit.createLabel(parent, "");
- } else {
- label = new Label(parent, SWT.LEFT);
- }
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.BEGINNING;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.horizontalIndent = 0;
- gd.widthHint = 0;
- gd.heightHint = 0;
- label.setLayoutData(gd);
- return label;
- }
-
- /**
- * Tests is the control is not <code>null</code> and not disposed.
- */
- protected final boolean isOkToUse(Control control) {
- return (control != null) && !(control.isDisposed());
- }
-
- // --------- enable / disable management
-
- /**
- * Sets the enable state of the dialog field.
- */
- public final void setEnabled(boolean enabled) {
- if (enabled != _enabled) {
- _enabled = enabled;
- updateEnableState();
- }
- }
-
- /**
- * Called when the enable state changed. To be extended by dialog field
- * implementors.
- */
- protected void updateEnableState() {
- if (_label != null && !_label.isDisposed()) {
- _label.setEnabled(_enabled);
- }
- if (_hyperlink != null && !_hyperlink.isDisposed()) {
- _hyperlink.setEnabled(_enabled);
- }
- }
-
- /**
- * Gets the enable state of the dialog field.
- */
- public final boolean isEnabled() {
- return _enabled;
- }
-
- protected final void assertCompositeNotNull(Composite comp) {
- Assert.isNotNull(comp,
- "uncreated control requested with composite null"); //$NON-NLS-1$
- }
-
- protected final void assertEnoughColumns(int nColumns) {
- Assert.isTrue(nColumns >= getNumberOfControls(),
- "given number of columns is too small"); //$NON-NLS-1$
- }
-
- /**
- * Get attached data by key.
- *
- * @param key
- * @return the attached data object for key
- */
- public Object getAttachedData(Object key) {
- if (_attachedData != null) {
- return _attachedData.get(key);
- }
- return null;
- }
-
- /**
- * You can attach any data to the DialogField, and get it using the
- * <code>getAttachedData</code> method.
- *
- * @param key
- * @param value
- */
- public void putAttachedData(Object key, Object value) {
- if (_attachedData == null) {
- _attachedData = new HashMap();
- }
- _attachedData.put(key, value);
- }
-
- /**
- * this method give the DialogField a chance to set the correct column to
- * grab horizontal space. In the implementation of this method, should only
- * change the GridData of control, should not do anything else.
- *
- * The caller is responsible to make sure the controls for the dialog field
- * has been created before calling this method.
- */
- public void handleGrabHorizontal() {
- // do nothing.
- }
-
- public boolean isRequired() {
- return _isRequired;
- }
-
- public void setRequired(boolean isRequired) {
- this._isRequired = isRequired;
- }
-
- protected String getToolTip() {
- return toolTip;
- }
-
- public void setToolTip(String toolTip) {
- this.toolTip = toolTip;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
deleted file mode 100644
index 2e4c5bcbb..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This class represents a group of dialog fields, following the normal dialog
- * field's lifecycle.
- *
- * The design of this class is to make a section could be reused in both dialog
- * environment and form based editor environment.
- *
- * @author mengbo
- */
-public abstract class DialogFieldGroup {
- private IDialogFieldChangeListener _defaultChangeListener;
-
- private IDialogFieldApplyListener _defaultApplyListener;
-
- /**
- * set default handler, should be called before <code>initialize()</code>
- * @param changelistener
- *
- */
- public void setDefaultChangeListener(
- IDialogFieldChangeListener changelistener) {
- _defaultChangeListener = changelistener;
- }
-
- /**
- * Normally, the client should call this method in <code>initialize()</code>
- * for those field that wants to use the default event handler.
- *
- * @return could be null
- */
- public IDialogFieldChangeListener getDefaultChangeListener() {
- return _defaultChangeListener;
- }
-
- /**
- * set default handler, should be called before <code>initialize()</code>
- *
- * @param applylistener
- */
- public void setDefaultApplyListener(IDialogFieldApplyListener applylistener) {
- _defaultApplyListener = applylistener;
- }
-
- /**
- * Normally, the client should call this method in <code>initialize()</code>
- * for those field that wants to use the default event handler.
- *
- * @return could be null
- */
- public IDialogFieldApplyListener getDefaultApplyListener() {
- return _defaultApplyListener;
- }
-
- /**
- * it is supposed to create all dialog fields and setup event listeners in
- * this method.
- *
- * Normally client will create DialogFieldSection first, then
- * setDefaultChangeListener()/setDefaultApplyListener(), then call
- * initialize().
- */
- public abstract void initialize();
-
- /**
- * reload data from underlying model and set them into the dialog fields.
- *
- */
- public abstract void refreshData();
-
- /**
- * layout the dialog fields.
- *
- * @param toolkit
- * could be null
- * @param parent
- *
- */
- public abstract void layoutDialogFields(FormToolkit toolkit,
- Composite parent);
-
- /**
- * validate whether the values in the dialog fields are valid. This method
- * should also enable/disable dialog fields based on their current value and
- * relationship
- *
- * @return could return null. or an array containing null elements.
- */
- public abstract IStatus[] validateDialogFields();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java
deleted file mode 100644
index 9839eb059..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author mengbo
- */
-public class DialogFieldGroupPage extends WizardPage {
- private DialogFieldGroup _group;
-
- IDialogFieldChangeListener _defaultChangeListener = new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- validate();
- }
- };
-
- public DialogFieldGroupPage(String pageName, DialogFieldGroup section) {
- super(pageName);
- _group = section;
- initializeGroup(_group);
- }
-
- /**
- * child class could override this method.
- *
- * @param group
- */
- protected void initializeGroup(DialogFieldGroup group) {
- group.setDefaultChangeListener(_defaultChangeListener);
- group.initialize();
- }
-
- public void createControl(Composite parent) {
- Composite container = new Composite(parent, SWT.NONE);
- _group.layoutDialogFields(null, container);
- _group.refreshData();
- validate();
- this.setControl(container);
- }
-
- public DialogFieldGroup getDialogFieldGroup() {
- return _group;
- }
-
- public void validate() {
- IStatus[] statuses = _group.validateDialogFields();
- IStatus status = StatusUtil.getMostSevere(statuses);
- StatusUtil.applyToStatusLine(this, status);
- setPageComplete(status == null || status.getSeverity() != IStatus.ERROR);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java
deleted file mode 100644
index 7ae2eab81..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-
-/**
- * Resource bundle class for datastore wizard and it's pages
- *
- * @author mengbo
- */
-public class DialogFieldResources extends ResourceUtils {
- /** Create the logger for this class */
- private static Logger _log = JSFUICommonPlugin
- .getLogger(DialogFieldResources.class);
-
- private static DialogFieldResources _resource; // singleton
-
- private static final String BUNDLE = DialogFieldResources.class.getName(); //$NON-NLS-1$
-
- /**
- * Empty Constructor.
- *
- * @return WizardsResources
- */
-
- public static DialogFieldResources getInstance() {
- if (_resource == null) {
- _resource = new DialogFieldResources();
- }
- return _resource;
- }
-
- /**
- * The constructor create a resource bundle
- */
- protected DialogFieldResources() {
- try {
- _resources = ResourceBundle.getBundle(BUNDLE);
- // NOTE: this throws a runtime "MissingResourceException".
- } catch (MissingResourceException ee) {
- // Wizards.WizardResource.Error.ResourceNotFound = Unable to locate
- // resource.
- _log.error("Wizards.WizardResource.Error.ResourceNotFound", ee); //$NON-NLS-1$
- }
- setBundle(_resources, BUNDLE);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties
deleted file mode 100644
index 81d9c522a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-##################################################################
-# Resource message for SourceFolderButtonDialogField.
-##################################################################
-SourceFolderButtonDialogField.container.label = Source Folder:
-SourceFolderButtonDialogField.container.button = Browse...
-
-SourceFolderButtonDialogField.ChooseSourceContainerDialog.Title = Folder Selection
-SourceFolderButtonDialogField.ChooseSourceContainerDialog.Description = Choose a folder:
-
-SourceFolderButtonDialogField.error.EnterContainerName = Folder name is empty.
-SourceFolderButtonDialogField.error.NotSameProject = The project should be \''{0}\''.
-SourceFolderButtonDialogField.error.ContainerIsBinary=''{0}'' is a JAR archive.
-SourceFolderButtonDialogField.error.ContainerDoesNotExist=Folder ''{0}'' does not exist.
-SourceFolderButtonDialogField.error.NotAFolder=''{0}'' must be a project or folder.
-SourceFolderButtonDialogField.error.ProjectClosed=Project ''{0}'' must be accessible.
-SourceFolderButtonDialogField.warning.NotAJavaProject=Folder ''{0}'' is not a Java project.
-SourceFolderButtonDialogField.warning.NotInAJavaProject=Folder ''{0}'' is not in a Java project.
-SourceFolderButtonDialogField.warning.NotOnClassPath=Folder ''{0}'' is not on the Java build class path.
-
-
-##################################################################
-# Resource message for PackageButtonDialogField.
-##################################################################
-PackageButtonDialogField.package.label=Pac&kage:
-PackageButtonDialogField.package.button=Bro&wse...
-
-PackageButtonDialogField.error.InvalidPackageName=Package name ''{0}'' is not valid.
-PackageButtonDialogField.error.ClashOutputLocation=Package clashes with project output folder.
-PackageButtonDialogField.warning.DiscouragedPackageName=This package name ''{0}'' is discouraged.
-PackageButtonDialogField.warning.DefaultPackageDiscouraged=The use of the default package is discouraged.
-
-PackageButtonDialogField.ChoosePackageDialog.title=Package Selection
-PackageButtonDialogField.ChoosePackageDialog.description=&Choose a folder:
-PackageButtonDialogField.ChoosePackageDialog.empty=Cannot find packages to select.
-
-ClassButtonDialogField.Alert.Title=Error Open Type
-ClassButtonDialogField.Alert.Msg=The project does not have Java Nature.
-DialogFieldBase.Label.RequiredSymbol=* \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldWrapper.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldWrapper.java
deleted file mode 100644
index a0bf3014a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldWrapper.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-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.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This is a wrapper to a dialog field, by adding a small button at the end. The
- * caller is responsible to provide the image or lable text and the button click
- * handler.
- *
- * @author mengbo
- * @version 1.5
- * see CellEditorWrapper TODO: what relation to page designer?
- */
-
-public class DialogFieldWrapper implements DialogField, ISupportTextValue {
- private DialogField _wrappedDialogField;
-
- private Button _button;
-
- private boolean _buttonEnabled;
-
- private Image _buttonImage;
-
- private Image _disabledImage;
-
- private String _buttonLabel;
-
- private IStringButtonAdapter _adapter;
-
- /**
- *
- */
- public DialogFieldWrapper(DialogField field, Image image,
- Image disabledImage) {
- super();
- if (!(field instanceof ISupportTextValue)) {
- throw new IllegalArgumentException(
- "Field must be ISupportTextValue");
- }
- _wrappedDialogField = field;
- _buttonImage = image;
- _disabledImage = disabledImage;
- }
-
- /**
- *
- */
- public DialogFieldWrapper(DialogField field, String label) {
- super();
- if (!(field instanceof ISupportTextValue)) {
- throw new IllegalArgumentException(
- "Field must be ISupportTextValue");
- }
- _wrappedDialogField = field;
- _buttonLabel = label;
- }
-
- public void setButtonAdapter(IStringButtonAdapter adapter) {
- this._adapter = adapter;
- this.updateButtonControl();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.ISupportTextValue#setTextWithoutUpdate(java.lang.String)
- */
- public void setTextWithoutUpdate(String value) {
- ((ISupportTextValue) _wrappedDialogField).setTextWithoutUpdate(value);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.ISupportTextValue#getText()
- */
- public String getText() {
- return ((ISupportTextValue) _wrappedDialogField).getText();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.ISupportTextValue#setText(java.lang.String)
- */
- public void setText(String value) {
- ((ISupportTextValue) _wrappedDialogField).setText(value);
- }
-
- // --------------------------------------------------------------------------------------------
- // wrapped method to add the attached button
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#doFillIntoGrid(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite, int)
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- Control[] wrappedControls = _wrappedDialogField.doFillIntoGrid(toolkit,
- parent, nColumns - 1);
- Control[] result = new Control[wrappedControls.length];
-
- Control button = getButton(toolkit, parent);
- button.setLayoutData(gridDataForButton(1));
-
- System.arraycopy(wrappedControls, 0, result, 0, wrappedControls.length);
- result[result.length - 1] = _button;
- return result;
- }
-
- /**
- * @param span
- * @return
- */
- private GridData gridDataForButton(int span) {
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = span;
- gd.widthHint = gd.heightHint = 18;
- return gd;
- }
-
- /**
- * @param toolkit
- * @param parent
- * @return
- */
- private Control getButton(FormToolkit toolkit, Composite parent) {
- if (_button == null) {
- Assert.isNotNull(parent,
- "uncreated control requested with composite null"); //$NON-NLS-1$
- if (toolkit != null) {
- _button = toolkit.createButton(parent, "", SWT.PUSH);
- if (_buttonImage != null) {
- _button.setImage(_buttonImage);
- } else {
- _button.setText(_buttonLabel);
- }
- } else {
- _button = new Button(parent, SWT.PUSH);
- if (_buttonImage != null) {
- _button.setImage(_buttonImage);
- } else {
- _button.setText(_buttonLabel);
- }
- }
- _button.addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- if (!_button.isEnabled() && _disabledImage != null) {
- Rectangle buttonBounds = _button.getBounds();
- Rectangle imageBounds = _disabledImage.getBounds();
- e.gc.drawImage(_disabledImage,
- (buttonBounds.width - imageBounds.width) / 2,
- (buttonBounds.height - imageBounds.height) / 2);
- }
- }
- });
- _button.setEnabled(isEnabled() && _buttonEnabled);
- _button.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- buttonPressed();
- }
-
- public void widgetSelected(SelectionEvent e) {
- buttonPressed();
- }
- });
-
- }
- return _button;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#getLabelControl(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public Control getLabelControl(FormToolkit _formToolkit, Composite parent) {
- return _wrappedDialogField.getLabelControl(_formToolkit, parent);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#setHyperLink(org.eclipse.ui.forms.events.IHyperlinkListener)
- */
- public void setHyperLink(IHyperlinkListener listener) {
- _wrappedDialogField.setHyperLink(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#setLabelText(java.lang.String)
- */
- public void setLabelText(String labeltext) {
- _wrappedDialogField.setLabelText(labeltext);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#setDialogFieldChangeListener(org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldChangeListener)
- */
- public void setDialogFieldChangeListener(IDialogFieldChangeListener listener) {
- _wrappedDialogField.setDialogFieldChangeListener(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#setDialogFieldApplyListener(org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener)
- */
- public void setDialogFieldApplyListener(IDialogFieldApplyListener listener) {
- _wrappedDialogField.setDialogFieldApplyListener(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#setFocus()
- */
- public boolean setFocus() {
- return _wrappedDialogField.setFocus();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#getNumberOfControls()
- */
- public int getNumberOfControls() {
- return _wrappedDialogField.getNumberOfControls() + 1;
- }
-
- public void setButtonEnabled(boolean enabled) {
- this._buttonEnabled = enabled;
- updateButtonControl();
- }
-
- public boolean isButtonEnabled() {
- return _buttonEnabled;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#setEnabled(boolean)
- */
- public void setEnabled(boolean enabled) {
- _wrappedDialogField.setEnabled(enabled);
- updateButtonControl();
- }
-
- /**
- *
- */
- private void updateButtonControl() {
- if (this._button != null) {
- this._button.setEnabled(this.isEnabled() && _buttonEnabled
- && _adapter != null);
- _button.redraw();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#isEnabled()
- */
- public boolean isEnabled() {
- return _wrappedDialogField.isEnabled();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#getAttachedData(java.lang.Object)
- */
- public Object getAttachedData(Object key) {
- return _wrappedDialogField.getAttachedData(key);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogField#putAttachedData(java.lang.Object,
- * java.lang.Object)
- */
- public void putAttachedData(Object key, Object value) {
- _wrappedDialogField.putAttachedData(key, value);
- }
-
- protected void buttonPressed() {
- if (_adapter != null) {
- _adapter.changeControlPressed(this);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- _wrappedDialogField.handleGrabHorizontal();
- }
-
- public DialogField getWrappedDialogField() {
- return _wrappedDialogField;
- }
-
- public boolean isRequired() {
- return _wrappedDialogField.isRequired();
- }
-
- public void setToolTip(String toolTip) {
- _wrappedDialogField.setToolTip(toolTip);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java
deleted file mode 100644
index e8be7b8f8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-
-/**
- * @author mengbo
- */
-public interface IDialogFieldApplyListener {
- /**
- * when the DialogField believe it should apply its value in UI, will fire
- * this event.
- *
- * Normally, for text input, when user is typing, will only fire
- * dialogFieldChanged(), when lose focus will fire dialogFieldApplied().
- *
- * For other control, such as readonly combo box, whenever user change
- * selection, will fire both dialogFieldChanged() and dialogFieldApplied()
- *
- * @param field
- */
- void dialogFieldApplied(DialogField field);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java
deleted file mode 100644
index 3a7345268..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-
-/**
- * Change listener used by <code>DialogField</code>
- *
- * @author mengbo
- */
-public interface IDialogFieldChangeListener {
-
- /**
- * The dialog field has changed.
- */
- void dialogFieldChanged(DialogField field);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java
deleted file mode 100644
index 8fd7fe7b3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-
-/**
- * Change listener used by <code>StringButtonDialogField</code>
- */
-public interface IStringButtonAdapter {
-
- void changeControlPressed(DialogField field);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java
deleted file mode 100644
index 3e2ea5acd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-/**
- * DialogField can choose to also implement this interface. The purpose of this
- * interface is to make DialogFields to be more easily used to edit element
- * attributes, since attributes are all of string type.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface ISupportTextValue {
- public void setTextWithoutUpdate(String value);
-
- public String getText();
-
- public void setText(String value);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java
deleted file mode 100644
index 4aa0808c4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-/**
- * @author mengbo
- */
-public class JavaClassWizard extends Wizard {
- private static String STORE_SECTION = "JavaClassWizard"; //$NON-NLS-1$
-
- private JavaClassWizardPage _mainPage;
-
- private String _className, _classArgs;
-
- private IProject _project;
-
- private String _superClass;
-
- private List _interfaceList;
-
- private boolean _autoOpenResource = true;
-
- public void setAutoOpenResource(boolean autoOpenResource) {
- _autoOpenResource = autoOpenResource;
- }
-
- public JavaClassWizard(IProject project, String className) {
- this(project, className, null, null);
- }
-
- public JavaClassWizard(IProject project, String className,
- String superClass, List superInterfaces) {
- this._project = project;
- this._className = className;
- this._superClass = superClass;
- this._interfaceList = superInterfaces;
- IDialogSettings masterSettings = JSFUICommonPlugin.getDefault()
- .getDialogSettings();
- setDialogSettings(getSettingsSection(masterSettings));
- setWindowTitle(JSFUICommonPlugin
- .getResourceString("DialogField.JavaClassWizard.NewClass"));//$NON-NLS-1$
- setNeedsProgressMonitor(true);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
- public void addPages() {
- _mainPage = new JavaClassWizardPage(_project, _className, _superClass,
- _interfaceList);
- addPage(_mainPage);
- _mainPage.init();
- }
-
- private IDialogSettings getSettingsSection(IDialogSettings master) {
- IDialogSettings setting = master.getSection(STORE_SECTION);
- if (setting == null) {
- setting = master.addNewSection(STORE_SECTION);
- }
- return setting;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public boolean performFinish() {
- if (_mainPage.getPackageText() != null
- && _mainPage.getPackageText().length() > 0) {
- StringBuffer buffer = new StringBuffer(_mainPage.getPackageText());
- buffer.append(".");//$NON-NLS-1$
- buffer.append(_mainPage.getTypeName());
- _className = buffer.toString();
- } else {
- _className = _mainPage.getTypeName();
- }
- _classArgs = _mainPage.getClassArgs();
- IRunnableWithProgress op = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor)
- throws CoreException, InvocationTargetException,
- InterruptedException {
- _mainPage.createType(monitor);
- IResource resource = _mainPage.getModifiedResource();
- if (resource != null && _autoOpenResource) {
- selectAndReveal(resource);
- if (_project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject jProject = JavaCore.create(_project);
- IJavaElement jElement = jProject.findElement(resource
- .getProjectRelativePath()
- .removeFirstSegments(1));
- if (jElement != null) {
- JavaUI.openInEditor(jElement);
- }
- } else if (resource instanceof IFile) {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IDE.openEditor(page, (IFile) resource, true);
- }
- }
- }
-
- };
- try {
- getContainer().run(false, true, op);
- } catch (InvocationTargetException e) {
- e.printStackTrace(); // PDEPlugin.logException(e);
- } catch (InterruptedException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- return true;
- }
-
- protected void selectAndReveal(IResource newResource) {
- BasicNewResourceWizard.selectAndReveal(newResource,
- getWorkbenchWindow());
- }
-
- private IWorkbenchWindow getWorkbenchWindow() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- }
-
- protected ISchedulingRule getSchedulingRule() {
- return _mainPage.getModifiedResource();
- }
-
- public String getClassName() {
- return _className;
- }
-
- public String getClassNameWithArgs() {
- if (_classArgs != null && _classArgs.length() > 0) {
- StringBuffer buffer = new StringBuffer(_className);
- buffer.append(":");//$NON-NLS-1$
- buffer.append(_classArgs);
- return buffer.toString();
- }
- return getClassName();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java
deleted file mode 100644
index a99066659..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.wizards.NewClassWizardPage;
-
-/**
- * @author mengbo
- */
-public class JavaClassWizardPage extends NewClassWizardPage {
- private String _className;
-
- private IProject _project;
-
- private InitialClassProperties _initialValues;
-
- private IJavaProject _javaProject;
-
- private IStatus _fClassNameStatus, _fPackageNameStatus;
-
- private final static String SOURCE_COMPLIANCE_1_3 = JavaCore.VERSION_1_3;
-
- class InitialClassProperties {
- // populate new wizard page
- IType superClassType;
-
- String superClassName;
-
- List interfacesName;
-
- String className;
-
- String classArgs;
-
- String packageName;
-
- IPackageFragmentRoot packageFragmentRoot;
-
- IPackageFragment packageFragment;
-
- public InitialClassProperties() {
- this.superClassType = null;
- this.superClassName = ""; //$NON-NLS-1$
- this.interfacesName = null;
- this.className = null;
- this.classArgs = null;
- this.packageName = null;
- this.packageFragment = null;
- this.packageFragmentRoot = null;
- }
- }
-
- public JavaClassWizardPage(IProject project, String className,
- String superClassName, List interfacesName) {
- super();
- this._className = className;
- this._project = project;
- try {
- if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
- this._javaProject = JavaCore.create(project);
- } else {
- this._javaProject = null;
- }
- } catch (CoreException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- _initialValues = new InitialClassProperties();
- _initialValues.className = className;
- _initialValues.superClassName = superClassName;
- _initialValues.interfacesName = interfacesName;
- }
-
- public JavaClassWizardPage(IProject project, String className) {
- this(project, className, null, null);
- }
-
- public void init() {
- initializeExpectedValues();
- initializeWizardPage();
- }
-
- private void initializeExpectedValues() {
- // source folder name, package name, class name
- int loc = _className.indexOf(":"); //$NON-NLS-1$
- if (loc != -1) {
- if (loc < _className.length()) {
- _initialValues.classArgs = _className.substring(loc + 1,
- _className.length());
- _className = _className.substring(0, loc);
- }
- if (loc > 0) {
- _initialValues.className = _className.substring(0, loc);
- } else if (loc == 0) {
- _initialValues.className = ""; //$NON-NLS-1$
- }
- }
- _fClassNameStatus = JavaConventions
- .validateJavaTypeName(_initialValues.className, SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
-
- loc = _className.lastIndexOf('.');
- if (loc != -1) {
- _initialValues.packageName = _className.substring(0, loc);
- _initialValues.className = _className.substring(loc + 1);
- _fPackageNameStatus = JavaConventions
- .validateJavaTypeName(_initialValues.packageName, SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
- _fClassNameStatus = JavaConventions
- .validateJavaTypeName(_initialValues.className, SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
- }
- if (_javaProject == null) {
- return;
- }
- try {
- if (_initialValues.packageFragmentRoot == null) {
- IPackageFragmentRoot srcEntryDft = null;
- IPackageFragmentRoot[] roots = _javaProject
- .getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
- srcEntryDft = roots[i];
- break;
- }
- }
- if (srcEntryDft != null) {
- _initialValues.packageFragmentRoot = srcEntryDft;
- } else {
- _initialValues.packageFragmentRoot = _javaProject
- .getPackageFragmentRoot(_javaProject.getResource());
- }
- if (_initialValues.packageFragment == null
- && _initialValues.packageFragmentRoot != null
- && _initialValues.packageName != null
- && _initialValues.packageName.length() > 0) {
- IFolder packageFolder = _project
- .getFolder(_initialValues.packageName);
- _initialValues.packageFragment = _initialValues.packageFragmentRoot
- .getPackageFragment(packageFolder
- .getProjectRelativePath().toOSString());
- }
- }
- // superclass and interface
- if (_initialValues.superClassName == null) {
- _initialValues.superClassName = "java.lang.Object"; //$NON-NLS-1$
- }
- _initialValues.superClassType = findTypeForName(_initialValues.superClassName);
- } catch (JavaModelException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- }
-
- protected void initializeWizardPage() {
- setPackageFragmentRoot(_initialValues.packageFragmentRoot, true);
- setPackageFragment(_initialValues.packageFragment, true);
- setEnclosingType(null, true);
- setEnclosingTypeSelection(false, true);
- setTypeName(_initialValues.className, true);
- setSuperClass(_initialValues.superClassName, true);
- if (_initialValues.interfacesName != null) {
- setSuperInterfaces(_initialValues.interfacesName, true);
- }
- boolean hasSuperClass = _initialValues.superClassName != null
- && _initialValues.superClassName.length() > 0;
- boolean hasInterface = _initialValues.interfacesName != null
- && _initialValues.interfacesName.size() > 0;
- setMethodStubSelection(false, hasSuperClass, hasInterface
- || hasSuperClass, true);
- }
-
- private IType findTypeForName(String typeName) throws JavaModelException {
- if (typeName == null || typeName.length() == 0) {
- return null;
- }
- IType type = null;
- String fileName = typeName.replace('.', '/') + ".java"; //$NON-NLS-1$
- IJavaElement element = _javaProject.findElement(new Path(fileName));
- if (element == null) {
- return null;
- }
- if (element instanceof IClassFile) {
- type = ((IClassFile) element).getType();
- } else if (element instanceof ICompilationUnit) {
- IType[] types = ((ICompilationUnit) element).getTypes();
- type = types[0];
- }
- return type;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.wizards.NewClassWizardPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- // policy: wizards are not allowed to come up with an error message;
- // in this wizard, some fields may need initial validation and thus,
- // potentially start with an error message.
- if (_fClassNameStatus != null && !_fClassNameStatus.isOK()) {
- updateStatus(_fClassNameStatus);
- }
- if (_fPackageNameStatus != null && !_fPackageNameStatus.isOK()) {
- updateStatus(_fPackageNameStatus);
- }
- }
-
- public String getClassArgs() {
- if (_initialValues.classArgs == null) {
- return ""; //$NON-NLS-1$
- }
- return _initialValues.classArgs;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java
deleted file mode 100644
index 0cbcfe4c8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-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.search.IJavaSearchScope;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-
-/**
- * @author mengbo
- */
-public class JavaSearchScope implements IJavaSearchScope {
- private IProject _project;
-
- private String _superType;
-
- private HashSet _allowedTypeSet;
-
- private IPath[] _enclosingProjectsAndJars;
-
- private IProject[] _relativeProjects;
-
- public JavaSearchScope(IProject project, String superType) {
- this._project = project;
- this._superType = superType;
- computeRelativeProjects();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#enclosingProjectsAndJars()
- */
- public IPath[] enclosingProjectsAndJars() {
- if (_enclosingProjectsAndJars == null) {
- ArrayList list = new ArrayList();
- for (int i = 0; i < _relativeProjects.length; i++) {
- try {
- if (_relativeProjects[i].hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore
- .create(_relativeProjects[i]);
- IClasspathEntry[] classpath = javaProject
- .getResolvedClasspath(true);
- for (int j = 0; j < classpath.length; j++) {
- list.add(classpath[j].getPath());
- }
- list.add(javaProject.getPath());
- }
- } catch (CoreException e)// NOPMD
- {
- // skip the project.
- }
- }
- _enclosingProjectsAndJars = (IPath[]) list.toArray(new IPath[(list
- .size())]);
- }
- return _enclosingProjectsAndJars;
- }
-
- private void computeRelativeProjects() {
- try {
- IProject[] referencedProjects = _project.getReferencedProjects();
- _relativeProjects = new IProject[referencedProjects.length + 1];
- System.arraycopy(referencedProjects, 0, _relativeProjects, 1,
- referencedProjects.length);
- _relativeProjects[0] = _project;
- } catch (CoreException e) {
- _relativeProjects = new IProject[] { _project };
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(java.lang.String)
- */
- public boolean encloses(String resourcePath) {
- if (_allowedTypeSet == null) {
- try {
- _allowedTypeSet = findAllowedTypes(_superType);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- if (_allowedTypeSet == null) {
- _allowedTypeSet = new HashSet();
- }
- int separatorIndex = resourcePath.indexOf(JAR_FILE_ENTRY_SEPARATOR);
- if (separatorIndex != -1) {
- String className = resourcePath.substring(separatorIndex + 1,
- resourcePath.length() - 6).replace('/', '.');
- if (_allowedTypeSet.contains(className)) {
- return true;
- }
- } else if (_allowedTypeSet.contains(resourcePath)) {
- return true;
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(org.eclipse.jdt.core.IJavaElement)
- */
- public boolean encloses(IJavaElement element) {
- return encloses(element.getPath().toString());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesBinaries()
- */
- public boolean includesBinaries() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesClasspaths()
- */
- public boolean includesClasspaths() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesBinaries(boolean)
- */
- public void setIncludesBinaries(boolean includesBinaries) {
- // do nothing, includeBinaries always true
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesClasspaths(boolean)
- */
- public void setIncludesClasspaths(boolean includesClasspaths) {
- // do nothing, includeClasspaths always trues
- }
-
- private HashSet findAllowedTypes(String superType) throws CoreException {
- HashSet set = new HashSet();
-
- IProject[] projects = _relativeProjects;
-
- for (int i = 0; i < projects.length; i++) {
- IType type = null;
- if (projects[i].hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(projects[i]);
- if (superType != null) {
- try {
- type = javaProject.findType(superType);
- if (type != null) {
- ITypeHierarchy typeHierarchy = type
- .newTypeHierarchy(javaProject, null);
- IType[] subtypes = typeHierarchy
- .getAllSubtypes(type);
- for (int j = 0; j < subtypes.length; j++) {
- if (!subtypes[j].isBinary()) {
- set.add(subtypes[j].getPath().toString());
- } else {
- String path = subtypes[j].getPath()
- .toString();
- if (path != null
- && path
- .endsWith(IFileFolderConstants.DOT
- + IFileFolderConstants.EXT_JAR)) {
- set.add(subtypes[j]
- .getFullyQualifiedName());
- } else {
- set.add(path);
- }
- }
- }
- }
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
- }
- }
- return set;
- }
-
- /**
- * @return Returns the superType.
- */
- public String getSuperType() {
- return _superType;
- }
-
- /**
- * @param superType
- * The superType to set.
- */
- public void setSuperType(String superType) {
- this._superType = superType;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java
deleted file mode 100644
index 25ff03d02..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JavaSearchScopeDecorator implements IJavaSearchScope {
- JavaSearchScope[] _scopes = new JavaSearchScope[0];
-
- public JavaSearchScopeDecorator(IProject project, List superTypes) {
- List scopeList = new ArrayList();
- if (superTypes != null) {
- for (int i = 0; i < superTypes.size(); i++) {
- scopeList.add(new JavaSearchScope(project, superTypes.get(i)
- .toString()));
- }
- }
- _scopes = (JavaSearchScope[]) scopeList
- .toArray(new JavaSearchScope[scopeList.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(java.lang.String)
- */
- public boolean encloses(String resourcePath) {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].encloses(resourcePath) == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(org.eclipse.jdt.core.IJavaElement)
- */
- public boolean encloses(IJavaElement element) {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].encloses(element) == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#enclosingProjectsAndJars()
- */
- public IPath[] enclosingProjectsAndJars() {
- Set set = new HashSet();
- for (int i = 0; i < _scopes.length; i++) {
- set.addAll(Arrays.asList(_scopes[i].enclosingProjectsAndJars()));
- }
- return (IPath[]) set.toArray(new IPath[set.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesBinaries()
- */
- public boolean includesBinaries() {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].includesBinaries() == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesClasspaths()
- */
- public boolean includesClasspaths() {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].includesClasspaths() == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesBinaries(boolean)
- */
- public void setIncludesBinaries(boolean includesBinaries) {
- for (int i = 0; i < _scopes.length; i++) {
- _scopes[i].setIncludesBinaries(includesBinaries);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesClasspaths(boolean)
- */
- public void setIncludesClasspaths(boolean includesClasspaths) {
- for (int i = 0; i < _scopes.length; i++) {
- _scopes[i].setIncludesClasspaths(includesClasspaths);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java
deleted file mode 100644
index 4847fb846..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * @author mengbo
- */
-public class JavaUIHelper {
- public static void doOpenClass(IProject project, String className) {
- String path = className.replace('.', '/') + ".java"; //$NON-NLS-1$
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- IJavaElement result = javaProject.findElement(new Path(path));
- JavaUI.openInEditor(result);
- } else {
- IResource resource = project.findMember(new Path(path));
- if (resource != null && resource instanceof IFile) {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IDE.openEditor(page, (IFile) resource, true);
- }
- }
- } catch (PartInitException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- } catch (JavaModelException e) {
- e.printStackTrace();// Display.getCurrent().beep();
- } catch (CoreException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- }
-
- public static boolean doesClassExist(IProject project, String className) {
- String path = className.replace('.', '/') + ".java"; //$NON-NLS-1$
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
-
- IJavaElement result = javaProject.findElement(new Path(path));
- return result != null;
- }
- IResource resource = project.findMember(new Path(path));
- return resource != null;
- } catch (JavaModelException e) {
- return false;
- } catch (CoreException e) {
- return false;
- }
- }
-
- public static SelectionDialog openSelectionDialog(Shell shell,
- IJavaSearchScope searchScope, int typeFlag) {
- try {
- return JavaUI.createTypeDialog(shell, new ProgressMonitorDialog(
- shell), searchScope, typeFlag, false);
- } catch (JavaModelException e) {
- JSFUICommonPlugin.getLogger(JavaUIHelper.class).error(e);
- return null;
- }
- }
-
- public static SelectionDialog openSelectionDialog(Shell shell,
- IProject project, String superType, int typeFlag) {
- IJavaSearchScope searchScope = findSearchScope(project, superType);
- return openSelectionDialog(shell, searchScope, typeFlag);
- }
-
- public static SelectionDialog openSelectionDialog(Shell shell,
- IProject project, String superType) {
- IJavaSearchScope searchScope = findSearchScope(project, superType);
- return openSelectionDialog(shell, searchScope,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
- }
-
- public static IJavaSearchScope findSearchScope(IProject project,
- String superType) {
- if (project != null) {
- if (superType == null || "".equals(superType)) {
- superType = "java.lang.Object";//$NON-NLS-1$
- }
- return new JavaSearchScope(project, superType);
- }
- return SearchEngine.createWorkspaceScope();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java
deleted file mode 100644
index 25e828068..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-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.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class LayoutUtil {
- // The Text control looks higher then Button control when they have the same
- // height,
- // Increasing the height of 5 pixels will make them looks the same height.
- private final static int BUTTON_HEIGHT_ADJUSTMENT = 5;
-
- public static Control createEmptySpace(FormToolkit kit, Composite parent,
- int span) {
- Label label;
- if (kit != null) {
- label = kit.createLabel(parent, "");
- } else {
- label = new Label(parent, SWT.LEFT);
- }
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.BEGINNING;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.horizontalIndent = 0;
- gd.widthHint = 0;
- gd.heightHint = 0;
- label.setLayoutData(gd);
- return label;
- }
-
- public static Composite createComposite(FormToolkit kit, Composite parent,
- int span, int internalSpan) {
- Composite c;
- if (kit != null) {
- c = kit.createComposite(parent);
- kit.paintBordersFor(c);
- } else {
- c = new Composite(parent, SWT.NONE);
- }
- GridData gd = new GridData();
- gd.grabExcessHorizontalSpace = true;
- gd.horizontalSpan = span;
- gd.horizontalIndent = 0;
- c.setLayoutData(gd);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = internalSpan;
- c.setLayout(layout);
-
- return c;
- }
-
- /**
- * Calculates the number of columns needed by field editors
- */
- public static int getNumberOfColumns(DialogField[] editors) {
- int nCulumns = 0;
- for (int i = 0; i < editors.length; i++) {
- nCulumns = Math.max(editors[i].getNumberOfControls(), nCulumns);
- }
- return nCulumns;
- }
-
- /**
- * Creates a composite and fills in the given editors.
- *
- * @param labelOnTop
- * Defines if the label of all fields should be on top of the
- * fields
- */
- public static void doDefaultLayout(FormToolkit toolkit, Composite parent,
- DialogField[] editors, boolean labelOnTop) {
- doDefaultLayout(toolkit, parent, editors, labelOnTop, 0, 0, 0, 0);
- }
-
- /**
- * Creates a composite and fills in the given editors.
- *
- * @param labelOnTop
- * Defines if the label of all fields should be on top of the
- * fields
- * @param minWidth
- * The minimal width of the composite
- * @param minHeight
- * The minimal height of the composite
- */
- public static void doDefaultLayout(FormToolkit toolkit, Composite parent,
- DialogField[] editors, boolean labelOnTop, int minWidth,
- int minHeight) {
- doDefaultLayout(toolkit, parent, editors, labelOnTop, minWidth,
- minHeight, 0, 0);
- }
-
- /**
- * Creates a composite and fills in the given editors.
- *
- * @param labelOnTop
- * Defines if the label of all fields should be on top of the
- * fields
- * @param minWidth
- * The minimal width of the composite
- * @param minHeight
- * The minimal height of the composite
- * @param marginWidth
- * The margin width to be used by the composite
- * @param marginHeight
- * The margin height to be used by the composite
- * @deprecated
- */
- public static void doDefaultLayout(FormToolkit toolkit, Composite parent,
- DialogField[] editors, boolean labelOnTop, int minWidth,
- int minHeight, int marginWidth, int marginHeight) {
- int nCulumns = getNumberOfColumns(editors);
- Control[][] controls = new Control[editors.length][];
- for (int i = 0; i < editors.length; i++) {
- controls[i] = editors[i].doFillIntoGrid(toolkit, parent, nCulumns);
- }
- if (labelOnTop) {
- nCulumns--;
- modifyLabelSpans(controls, nCulumns);
- }
- GridLayout layout = new GridLayout();
- if (marginWidth != SWT.DEFAULT) {
- layout.marginWidth = marginWidth;
- }
- if (marginHeight != SWT.DEFAULT) {
- layout.marginHeight = marginHeight;
- }
- layout.numColumns = nCulumns;
- parent.setLayout(layout);
- }
-
- private static void modifyLabelSpans(Control[][] controls, int nCulumns) {
- for (int i = 0; i < controls.length; i++) {
- setHorizontalSpan(controls[i][0], nCulumns);
- }
- }
-
- /**
- * Sets the span of a control. Assumes that GridData is used.
- */
- public static void setHorizontalSpan(Control control, int span) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).horizontalSpan = span;
- } else if (span != 1) {
- GridData gd = new GridData();
- gd.horizontalSpan = span;
- control.setLayoutData(gd);
- }
- }
-
- public static void setGrabHorizontal(Control control, boolean grab) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).grabExcessHorizontalSpace = grab;
- }
- }
-
- /**
- * Sets the width hint of a control. Assumes that GridData is used.
- */
- public static void setWidthHint(Control control, int widthHint) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).widthHint = widthHint;
- }
- }
-
- /**
- * Sets the heigthHint hint of a control. Assumes that GridData is used.
- */
- public static void setHeigthHint(Control control, int heigthHint) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).heightHint = heigthHint;
- }
- }
-
- /**
- * Sets the horizontal indent of a control. Assumes that GridData is used.
- */
- public static void setHorizontalIndent(Control control, int horizontalIndent) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).horizontalIndent = horizontalIndent;
- }
- }
-
- /**
- * Sets the horizontal indent of a control. Assumes that GridData is used.
- */
- public static void setHorizontalGrabbing(Control control) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).grabExcessHorizontalSpace = true;
- }
- }
-
- /**
- * Returns a width hint for a button control.
- */
- public static int getButtonWidthHint(Button button) {
- if (button.getFont().equals(JFaceResources.getDefaultFont()))
- button.setFont(JFaceResources.getDialogFont());
-
- GC gc = new GC(button);
- gc.setFont(button.getFont());
- FontMetrics fontMetrics = gc.getFontMetrics();
- gc.dispose();
-
- int length = button.getText().length();
- int widthHint = Dialog.convertWidthInCharsToPixels(fontMetrics,
- length < 2 ? 2 : length);
- return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT,
- true).x);
- }
-
- public static int getButtonHeightHint(FormToolkit toolkit, Text text) {
- if (toolkit != null) {
- return text.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y
- + BUTTON_HEIGHT_ADJUSTMENT;
- }
- return text.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LocaleComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LocaleComboDialogField.java
deleted file mode 100644
index 0c7c6a17e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LocaleComboDialogField.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.Arrays;
-import java.util.Locale;
-
-
-/**
- * @author mengbo
- */
-public class LocaleComboDialogField extends ComboDialogField {
- private static String[] items;
- static {
- Locale[] locales = Locale.getAvailableLocales();
- items = new String[locales.length + 1];
- for (int i = 0, n = locales.length; i < n; i++) {
- items[i] = locales[i].toString();
- }
- items[locales.length] = "";
- Arrays.sort(items);
- }
-
- /**
- * @param flags
- */
- public LocaleComboDialogField(int flags) {
- super(flags);
- setItems(items);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/MultiTypeButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/MultiTypeButtonDialogField.java
deleted file mode 100644
index 7aa792e66..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/MultiTypeButtonDialogField.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class MultiTypeButtonDialogField extends AbstractClassButtonDialogField {
- IJavaSearchScope _scope;
-
- /**
- * @param project
- */
- public MultiTypeButtonDialogField(IProject project) {
- super(project);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#getJavaSearchScope()
- */
- protected IJavaSearchScope getJavaSearchScope() {
- if (_scope == null) {
- List list = new ArrayList();
- String superClassName = getSuperClassName();
- if (superClassName != null && !"".equalsIgnoreCase(superClassName)) {
- list.add(getSuperClassName());
- }
- list.addAll(getInterfacesList());
- _scope = new JavaSearchScopeDecorator(this.getProject(), list);
- }
- return _scope;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#getImplementInterfaces()
- */
- protected List getImplementInterfaces() {
- List list = getInterfacesList();
- if (list.size() == 1) {
- return list;
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#setProject(org.eclipse.core.resources.IProject)
- */
- public void setProject(IProject project) {
- if (project != getProject()) {
- _scope = null;
- }
- super.setProject(project);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/NumberDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/NumberDialogField.java
deleted file mode 100644
index 8755c5acd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/NumberDialogField.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * The text input only allows numbers
- *
- * @author mengbo
- * @version 1.5
- */
-public class NumberDialogField extends StringDialogField {
- public Control[] doFillIntoGrid(FormToolkit kit, Composite parent,
- int nColumns) {
- Control[] controls = super.doFillIntoGrid(kit, parent, nColumns);
-
- getTextControl(kit, parent).addVerifyListener(new VerifyListener() {
- public void verifyText(VerifyEvent e) {
- String str = ((Text) e.getSource()).getText();
- String newString = str.substring(0, e.start) + e.text
- + str.substring(e.end, str.length());
- String regExpression = "^[1-9][0-9]*";
- e.doit = (newString.length() == 0 || newString
- .matches(regExpression));
- }
- });
-
- return controls;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/PackageButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/PackageButtonDialogField.java
deleted file mode 100644
index 223835238..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/PackageButtonDialogField.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-//import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
-/**
- * This dialog field is used to select the package in the IPackageFragmentRoot
- *
- *
- * @author mengbo
- * @version 1.5
- */
-public class PackageButtonDialogField extends StringButtonDialogField {
- /** Create the logger for this class */
- private static Logger _log = JSFUICommonPlugin
- .getLogger(PackageButtonDialogField.class);
-
- /*
- * package fragment root corresponding to the input type (can be null)
- */
- private IPackageFragmentRoot _fCurrRoot;
-
- private IPackageFragment _fCurrPackage;
-
- private final static String SOURCE_COMPLIANCE_1_3 = JavaCore.VERSION_1_3;
-
- /**
- * @param packageRoot
- */
- public PackageButtonDialogField(IPackageFragmentRoot packageRoot) {
- super(null);
- setPackageFragmentRoot(packageRoot);
-
- setLabelText(DialogFieldResources.getInstance().getString(
- "PackageButtonDialogField.package.label"));
-
- setButtonLabel(DialogFieldResources.getInstance().getString(
- "PackageButtonDialogField.package.button"));
-
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- packageChangeControlPressed(field);
- }
-
- });
-
- }
-
- /**
- * @param field
- */
- protected void packageChangeControlPressed(DialogField field) {
- IPackageFragment pack = choosePackage();
- if (pack != null) {
- setPackageFragment(pack, true);
- }
- }
-
- /**
- * Sets the current source folder (model and text field) to the given
- * package fragment root.
- *
- * @param root
- * The new root.
- */
- public void setPackageFragmentRoot(IPackageFragmentRoot root) {
- _fCurrRoot = root;
- enableButton(getPackageFragmentRoot() != null);
- }
-
- /**
- * Returns the <code>IPackageFragmentRoot</code> that corresponds to the
- * current value of the source folder field.
- *
- * @return the IPackageFragmentRoot or <code>null</code> if the current
- * source folder value is not a valid package fragment root
- *
- */
- public IPackageFragmentRoot getPackageFragmentRoot() {
- return _fCurrRoot;
- }
-
- /**
- * selection dialogs
- */
- private IPackageFragment choosePackage() {
- IPackageFragmentRoot froot = getPackageFragmentRoot();
- IJavaElement[] packages = null;
- try {
- if (froot != null && froot.exists()) {
- packages = froot.getChildren();
- }
- } catch (JavaModelException e) {
- _log.error(e);
- }
- if (packages == null) {
- packages = new IJavaElement[0];
- }
-
- ElementListSelectionDialog dialog = new ElementListSelectionDialog(
- getShell(), new JavaElementLabelProvider(
- JavaElementLabelProvider.SHOW_DEFAULT));
- dialog.setIgnoreCase(false);
- dialog.setTitle(DialogFieldResources.getInstance().getString(
- "PackageButtonDialogField.ChoosePackageDialog.title")); //$NON-NLS-1$
- dialog.setMessage(DialogFieldResources.getInstance().getString(
- "PackageButtonDialogField.ChoosePackageDialog.description")); //$NON-NLS-1$
- dialog
- .setEmptyListMessage(DialogFieldResources
- .getInstance()
- .getString(
- "PackageButtonDialogField.ChoosePackageDialog.empty")); //$NON-NLS-1$
- dialog.setElements(packages);
- IPackageFragment pack = getPackageFragment();
- if (pack != null) {
- dialog.setInitialSelections(new Object[] { pack });
- }
-
- if (dialog.open() == Window.OK) {
- return (IPackageFragment) dialog.getFirstResult();
- }
- return null;
- }
-
- /**
- * Returns the package fragment corresponding to the current input.
- *
- * @return a package fragment or <code>null</code> if the input could not
- * be resolved.
- */
- public IPackageFragment getPackageFragment() {
- return _fCurrPackage;
- }
-
- /**
- * Sets the package fragment to the given value. The method updates the
- * model and the text of the control.
- *
- * @param pack
- * the package fragment to be set
- * @param canBeModified
- * if <code>true</code> the package fragment is editable;
- * otherwise it is read-only.
- */
- public void setPackageFragment(IPackageFragment pack, boolean canBeModified) {
- _fCurrPackage = pack;
- String str = (pack == null) ? "" : pack.getElementName(); //$NON-NLS-1$
- setText(str);
- setEnabled(canBeModified);
- }
-
- /**
- * Returns the text of the package input field.
- *
- * @return the text of the package input field
- */
- public String getPackageText() {
- return getText();
- }
-
- /**
- * The method validates the package name and returns the status of the
- * validation. The validation also updates the package fragment model.
- *
- * @return the status of the validation
- */
- public IStatus getChangedStatus() {
- StatusInfo status = new StatusInfo();
-
- String packName = getPackageText();
- if (packName.length() > 0) {
- IStatus val = JavaConventions.validatePackageName(packName,SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
- if (val.getSeverity() == IStatus.ERROR) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "PackageButtonDialogField.error.InvalidPackageName", val.getMessage())); //$NON-NLS-1$
- return status;
- } else if (val.getSeverity() == IStatus.WARNING) {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "PackageButtonDialogField.warning.DiscouragedPackageName", val.getMessage())); //$NON-NLS-1$
- // continue
- }
- } else {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "PackageButtonDialogField.warning.DefaultPackageDiscouraged")); //$NON-NLS-1$
- }
-
- IPackageFragmentRoot root = getPackageFragmentRoot();
- if (root != null) {
- if (root.getJavaProject().exists() && packName.length() > 0) {
- try {
- IPath rootPath = root.getPath();
- IPath outputPath = root.getJavaProject()
- .getOutputLocation();
- if (rootPath.isPrefixOf(outputPath)
- && !rootPath.equals(outputPath)) {
- // if the bin folder is inside of our root, don't allow
- // to name a package
- // like the bin folder
- IPath packagePath = rootPath.append(packName.replace(
- '.', '/'));
- if (outputPath.isPrefixOf(packagePath)) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "PackageButtonDialogField.error.ClashOutputLocation")); //$NON-NLS-1$
- return status;
- }
- }
- } catch (JavaModelException e) {
- _log.error(e);
- // let pass
- }
- }
-
- _fCurrPackage = root.getPackageFragment(packName);
- } else {
- status.setError(""); //$NON-NLS-1$
- }
- return status;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
deleted file mode 100644
index cfe52bca0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-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.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This will display a labal and a group of radio buttons. The group of radio
- * buttons will be layed out horizontally use a RowLayout, and them as a group
- * will use one cell in the GridLayout.
- *
- * Whenever the radios selection change will fire both dialogFieldChanged() and
- * dialogFieldApplied() event.
- *
- * @author mengbo
- */
-public class RadiosDialogField extends DialogFieldBase {
- final static private String INDEXKEY = "INDEX";
-
- private Composite _group;
-
- private String[] _items;
-
- private Button[] _button;
-
- private int _selectIndex = -1;
-
- private boolean _fireEvent = true;
-
- /**
- * Default constructor
- */
- public RadiosDialogField() {
- super();
- }
-
- /**
- * this method must be called before create control
- *
- * @param items
- */
- public void setItems(String[] items) {
- _items = items;
- _button = new Button[_items.length];
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- _group = getGroup(toolkit, parent);
- _group.setLayoutData(gridDataForGroup(nColumns - 2));
-
- return new Control[] { requiredLabel, label, _group };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- protected static GridData gridDataForGroup(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_group)) {
- _group.setFocus();
- }
- return true;
- }
-
- // ------- ui creation
-
- public Composite getGroup(FormToolkit toolkit, Composite parent) {
- if (_group == null) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _group = toolkit.createComposite(parent);
- } else {
- _group = new Composite(parent, SWT.NONE);
- }
- RowLayout layout = new RowLayout();
- layout.marginBottom = 0;
- _group.setLayout(layout);
- for (int i = 0; i < _items.length; i++) {
- if (toolkit != null) {
- _button[i] = toolkit.createButton(_group, _items[i],
- SWT.RADIO);
- } else {
- _button[i] = new Button(_group, SWT.RADIO);
- _button[i].setText(_items[i]);
- }
- _button[i].setData(INDEXKEY, new Integer(i));
- _button[i].addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (_fireEvent) {
- _selectIndex = ((Integer) e.widget
- .getData(INDEXKEY)).intValue();
- // FIXME: seemed will fire widgetSelected twice, one
- // for the deselect one,
- // one for the newly selected one. Need investigate.
- if (((Button) e.widget).getSelection()) {
- dialogFieldChangedAndApplied();
- }
- }
- }
-
- });
- }
- }
- return _group;
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_group)) {
- _group.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setSelectedIndex(int index) {
- _selectIndex = index;
- if (isOkToUse(_group)) {
- if (_selectIndex >= 0 && _selectIndex < _items.length) {
- _button[_selectIndex].setSelection(true);
- } else {
- for (int i = 0; i < _items.length; i++) {
- if (_button[i].getSelection()) {
- _button[i].setSelection(false);
- }
- }
- }
- }
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setSelectedIndexWithoutUpdate(int index) {
- _selectIndex = index;
- if (isOkToUse(_group)) {
- _fireEvent = false;
- if (_selectIndex >= 0 && _selectIndex < _items.length) {
- _button[_selectIndex].setSelection(true);
- } else {
- for (int i = 0; i < _items.length; i++) {
- if (_button[i].getSelection()) {
- _button[i].setSelection(false);
- }
- }
- }
- _fireEvent = true;
- }
- }
-
- public int getSelectedIndex() {
- return _selectIndex;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(this._group, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java
deleted file mode 100644
index 0ef4993c5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-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.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.dialogs.CommonResourceDialog;
-import org.eclipse.jst.jsf.common.ui.internal.utils.PathUtil;
-import org.eclipse.jst.jsf.common.ui.internal.utils.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This class provides a common resource choice DialogFiled. You must set a
- * no-null IProject instance to enable it working. You should give it a suffix
- * list if you want to choose files ended with specific file extensions. The
- * selection result will be a relative path based on the _referredFile's value
- * if it is set, or else based on the _project path.
- *
- * The usage: Shell shell = new Shell(); IProject project = getProject();
- * ResourceButtonDialogField localeField = new
- * ResourceButtonDialogField(project);
- * localeField.setResourceDescription("image"); localeField.setSuffixs(new
- * String[]{"bmp","jpg","gif"});
- * localeField.setReferredFile(StructuredModelUtil.getFileFor(_element.getModel()));
- *
- * @author mengbo
- */
-public class ResourceButtonDialogField extends StringButtonDialogField {
- private IProject _project;
-
- private String[] _suffixs;
-
- private String _resourceDescription;
-
- private IFile _referredFile;
-
- private boolean _isWebPath = false;
-
- private IFolder _folder;
-
- private String _separator = "";
-
- public ResourceButtonDialogField(IProject project) {
- this(null, project);
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- String oldValue = getText();
- String newValue = browseButtonPressed();
- if (newValue != null && !newValue.equals(oldValue)) {
- setText(newValue);
- }
- }
- });
- }
-
- public ResourceButtonDialogField(IStringButtonAdapter adapter,
- IProject project) {
- super(adapter);
- this._project = project;
- }
-
- protected String browseButtonPressed() {
- Shell shell = getShell();
- CommonResourceDialog dialog = null;
- int style = "".equals(_separator) ? SWT.NONE : SWT.MULTI | SWT.H_SCROLL
- | SWT.V_SCROLL;
- if (_folder != null) {
- dialog = new CommonResourceDialog(shell, _folder, style);
- } else {
- dialog = new CommonResourceDialog(shell, _project, style);
- }
- dialog.setTitle(JSFUICommonPlugin
- .getResourceString("DialogField.ResourceButton.SelectFile"));//$NON-NLS-1$
- dialog.setSuffixs(_suffixs);
- dialog.setResourceDescription(_resourceDescription);
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < result.length; i++) {
- String newValue = null;
- IPath path = ((IFile) result[i]).getLocation();
-
- IPath referredPath = null;
- if (_referredFile != null) {
- referredPath = _referredFile.getLocation();
- } else {
- referredPath = _project.getLocation();
- }
- if (this._isWebPath) {
- IFile selectedFile = ((IFile) result[i]);
- newValue = WebrootUtil.getWebPath(selectedFile
- .getFullPath());
- } else {
- newValue = PathUtil.convertToRelativePath(path.toString(),
- referredPath.toString());
- }
- buffer.append(newValue);
- buffer.append(_separator);
- }
- if (buffer.length() > 0) {
- return buffer.substring(0, buffer.length()
- - _separator.length());
- }
-
- }
- return null;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-
- /**
- * @return Returns the relative folder.
- */
- public IFolder getFolder() {
- return _folder;
- }
-
- /**
- * @param folder
- * The relative folder to set.
- */
- public void setFolder(IFolder folder) {
- this._folder = folder;
- }
-
- /**
- * @return Returns the referredFile.
- */
- public IFile getReferredFile() {
- return _referredFile;
- }
-
- /**
- * @param referredFile
- * The referredFile to set.
- */
- public void setReferredFile(IFile referredFile) {
- this._referredFile = referredFile;
- }
-
- /**
- * @return Returns the resourceDescription.
- */
- public String getResourceDescription() {
- return _resourceDescription;
- }
-
- /**
- * @param resourceDescription
- * The resourceDescription to set.
- */
- public void setResourceDescription(String resourceDescription) {
- this._resourceDescription = resourceDescription;
- }
-
- /**
- * @return Returns the suffixs.
- */
- public String[] getSuffixs() {
- return _suffixs;
- }
-
- /**
- * @param suffixs
- * The suffixs to set.
- */
- public void setSuffixs(String[] suffixs) {
- this._suffixs = suffixs;
- }
-
- /**
- * set some special path to web path instead of relative path
- *
- * @param isWebPath
- */
- public void setWebPath(boolean isWebPath) {
- this._isWebPath = isWebPath;
- }
-
- public boolean isWebPath() {
- return _isWebPath;
- }
-
- public String getSeparator() {
- return _separator;
- }
-
- public void setSeparator(String separator) {
- this._separator = separator;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
deleted file mode 100644
index 9b74c013a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field describing a separator.
- */
-public class Separator extends DialogFieldBase {
-
- private Label _separator;
-
- private int _style;
-
- public Separator() {
- this(SWT.NONE);
- }
-
- /**
- * @param style
- * of the separator. See <code>Label</code> for possible
- * styles.
- */
- public Separator(int style) {
- _style = style;
- }
-
- // ------- layout helpers
-
- /**
- * Creates the separator and fills it in a MGridLayout.
- *
- * @param height
- * The heigth of the separator
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns, int height) {
- assertEnoughColumns(nColumns);
-
- Control separator = getSeparator(toolkit, parent);
- separator.setLayoutData(gridDataForSeperator(nColumns, height));
-
- return new Control[] { separator };
- }
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- return doFillIntoGrid(toolkit, parent, nColumns, 4);
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 1;
- }
-
- protected static GridData gridDataForSeperator(int span, int height) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.BEGINNING;
- gd.heightHint = height;
- gd.horizontalSpan = span;
- return gd;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created separator.
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- */
- public Control getSeparator(FormToolkit toolkit, Composite parent) {
- if (_separator == null) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _separator = toolkit.createSeparator(parent, _style);
- } else {
- _separator = new Label(parent, _style);
- }
- }
- return _separator;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- // do nothing.
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java
deleted file mode 100644
index 03f9b12a7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-
-/**
- * This class provides a source folder selection DialogFiled. There are two
- * conditions: 1. If you set the IProject instance, the source folder selection
- * will only be limited in the specified project 2. If you set null, the source
- * folder selection is allowed in all workspaces
- *
- *
- * @author mengbo
- * @version 1.5
- */
-public class SourceFolderButtonDialogField extends StringButtonDialogField {
- /** Create the logger for this class */
- private static Logger _log = JSFUICommonPlugin
- .getLogger(SourceFolderButtonDialogField.class);
-
- /**
- * package fragment root corresponding to the input type (can be null)
- */
- private IPackageFragmentRoot _fCurrRoot;
-
- private IProject _project;
-
- /**
- * @param project
- */
- public SourceFolderButtonDialogField(IProject project) {
- super(null);
-
- _project = project;
-
- setLabelText(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.container.label"));
-
- setButtonLabel(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.container.button"));
-
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- containerChangeControlPressed(field);
- }
-
- });
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-
- /**
- * @param field
- */
- protected void containerChangeControlPressed(DialogField field) {
- // take the current jproject as init element of the dialog
- IPackageFragmentRoot root = getPackageFragmentRoot();
- root = chooseSourceContainer(root);
- if (root != null) {
- setPackageFragmentRoot(root, true);
- }
- }
-
- /**
- * Sets the current source folder (model and text field) to the given
- * package fragment root.
- *
- * @param root
- * The new root.
- * @param canBeModified
- * if <code>false</code> the source folder field can not be
- * changed by the user. If <code>true</code> the field is
- * editable
- */
- public void setPackageFragmentRoot(IPackageFragmentRoot root,
- boolean canBeModified) {
- _fCurrRoot = root;
- String str = (root == null) ? "" : root.getPath().makeRelative().toString(); //$NON-NLS-1$
- setText(str);
- setEnabled(canBeModified);
- }
-
- /**
- * Returns the <code>IPackageFragmentRoot</code> that corresponds to the
- * current value of the source folder field.
- *
- * @return the IPackageFragmentRoot or <code>null</code> if the current
- * source folder value is not a valid package fragment root
- *
- */
- public IPackageFragmentRoot getPackageFragmentRoot() {
- return _fCurrRoot;
- }
-
- /**
- * Returns the current text of source folder text field.
- *
- * @return the text of the source folder text field
- */
- public String getPackageFragmentRootText() {
- return getText();
- }
-
- /**
- * choose source container dialog
- *
- * @param initElement
- * @return
- */
- private IPackageFragmentRoot chooseSourceContainer(IJavaElement initElement) {
- Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class,
- IJavaProject.class, };
-
- TypedElementSelectionValidator validator = new TypedElementSelectionValidator(
- acceptedClasses, false) {
- // TODO: never used
-// public boolean isSelectedValid(Object element) {
-// try {
-// if (element instanceof IJavaProject) {
-// IJavaProject jproject = (IJavaProject) element;
-// IPath path = jproject.getProject().getFullPath();
-// return (jproject.findPackageFragmentRoot(path) != null);
-// } else if (element instanceof IPackageFragmentRoot) {
-// return (((IPackageFragmentRoot) element).getKind() == IPackageFragmentRoot.K_SOURCE);
-// }
-// return true;
-// } catch (JavaModelException e) {
-// _log.error("JavaModelException"); // just log, no ui in
-// // validation
-// }
-// return false;
-// }
- };
-
- acceptedClasses = new Class[] { IJavaModel.class,
- IPackageFragmentRoot.class, IJavaProject.class, };
- ViewerFilter filter = new TypedViewerFilter(acceptedClasses) {
- public boolean select(Viewer viewer, Object parent, Object element) {
- if (element instanceof IPackageFragmentRoot) {
- try {
- return (((IPackageFragmentRoot) element).getKind() == IPackageFragmentRoot.K_SOURCE);
- } catch (JavaModelException e) {
- _log.error(e); // just log, no ui
- // in validation
- return false;
- }
- }
- return super.select(viewer, parent, element);
- }
- };
-
- StandardJavaElementContentProvider provider = new StandardJavaElementContentProvider();
- ILabelProvider labelProvider = new JavaElementLabelProvider(
- JavaElementLabelProvider.SHOW_DEFAULT);
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
- getShell(), labelProvider, provider);
- dialog.setValidator(validator);
- dialog.setSorter(new JavaElementSorter());
- // HibernateWizardPage.ChooseSourceContainerDialog.Title = Folder
- // Selection
- dialog
- .setTitle(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.ChooseSourceContainerDialog.Title")); //$NON-NLS-1$
- // HibernateWizardPage.ChooseSourceContainerDialog.Description = Choose
- // a folder:
- dialog
- .setMessage(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.ChooseSourceContainerDialog.Description")); //$NON-NLS-1$
- dialog.addFilter(filter);
- if (_project != null) {
- dialog.setInput(JavaCore.create(_project));
- } else {
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace()
- .getRoot()));
- }
- dialog.setInitialSelection(initElement);
-
- if (dialog.open() == Window.OK) {
- Object element = dialog.getFirstResult();
- if (element instanceof IJavaProject) {
- IJavaProject jproject = (IJavaProject) element;
- return jproject.getPackageFragmentRoot(jproject.getProject());
- } else if (element instanceof IPackageFragmentRoot) {
- return (IPackageFragmentRoot) element;
- }
- return null;
- }
- return null;
- }
-
- /**
- * This method updates the model and returns an error status. The underlying
- * model is only valid if the returned status is OK.
- *
- * @return the model's error status
- */
- public IStatus getChangedStatus() {
- StatusInfo status = new StatusInfo();
-
- _fCurrRoot = null;
- String str = getPackageFragmentRootText();
- if (str.length() == 0) {
- // SourceFolderButtonDialogField.error.EnterContainerName = Folder
- // name is empty.
- status.setError(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.error.EnterContainerName")); //$NON-NLS-1$
- return status;
- }
- IPath path = new Path(str);
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(
- path);
- if (res != null) {
- int resType = res.getType();
- if (resType == IResource.PROJECT || resType == IResource.FOLDER) {
- IProject proj = res.getProject();
- if (!proj.isOpen()) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.ProjectClosed", proj.getFullPath().toString())); //$NON-NLS-1$
- return status;
- }
- if (_project != null && proj != _project) {
- // HibernateWizardPage.error.NotSameProject = The project
- // should be \''{0}\''.
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.NotSameProject", _project.getName())); //$NON-NLS-1$
- return status;
- }
- IJavaProject jproject = JavaCore.create(proj);
- _fCurrRoot = jproject.getPackageFragmentRoot(res);
- if (res.exists()) {
- try {
- if (!proj.hasNature(JavaCore.NATURE_ID)) {
- if (resType == IResource.PROJECT) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotAJavaProject", proj.getName())); //$NON-NLS-1$
- } else {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotInAJavaProject", proj.getName())); //$NON-NLS-1$
- }
- return status;
- }
- } catch (CoreException e) {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotAJavaProject", proj.getName())); //$NON-NLS-1$
- }
- if (!jproject.isOnClasspath(_fCurrRoot)) {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotOnClassPath", str)); //$NON-NLS-1$
- }
- if (_fCurrRoot.isArchive()) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.ContainerIsBinary", str)); //$NON-NLS-1$
- return status;
- }
- }
- return status;
- }
- status.setError(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.error.NotAFolder", str)); //$NON-NLS-1$
- return status;
- }
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.ContainerDoesNotExist", str)); //$NON-NLS-1$
- return status;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java
deleted file mode 100644
index c784b9641..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-
-/**
- * A settable IStatus. Can be an error, warning, info or ok. For error, info and
- * warning states, a message describes the problem.
- *
- * @author mengbo
- * @version 1.5
- */
-public class StatusInfo implements IStatus {
-
- public static final IStatus OK_STATUS = new StatusInfo();
-
- private String fStatusMessage;
-
- private int fSeverity;
-
- /**
- * Creates a status set to OK (no message)
- */
- public StatusInfo() {
- this(OK, null);
- }
-
- /**
- * Creates a status .
- *
- * @param severity
- * The status severity: ERROR, WARNING, INFO and OK.
- * @param message
- * The message of the status. Applies only for ERROR, WARNING and
- * INFO.
- */
- public StatusInfo(int severity, String message) {
- fStatusMessage = message;
- fSeverity = severity;
- }
-
- /**
- * Returns if the status' severity is OK.
- */
- public boolean isOK() {
- return fSeverity == IStatus.OK;
- }
-
- /**
- * Returns if the status' severity is WARNING.
- */
- public boolean isWarning() {
- return fSeverity == IStatus.WARNING;
- }
-
- /**
- * Returns if the status' severity is INFO.
- */
- public boolean isInfo() {
- return fSeverity == IStatus.INFO;
- }
-
- /**
- * Returns if the status' severity is ERROR.
- */
- public boolean isError() {
- return fSeverity == IStatus.ERROR;
- }
-
- /**
- * @see IStatus#getMessage
- */
- public String getMessage() {
- return fStatusMessage;
- }
-
- /**
- * Sets the status to ERROR.
- *
- * @param errorMessage
- * The error message (can be empty, but not null)
- */
- public void setError(String errorMessage) {
- Assert.isNotNull(errorMessage);
- fStatusMessage = errorMessage;
- fSeverity = IStatus.ERROR;
- }
-
- /**
- * Sets the status to WARNING.
- *
- * @param warningMessage
- * The warning message (can be empty, but not null)
- */
- public void setWarning(String warningMessage) {
- Assert.isNotNull(warningMessage);
- fStatusMessage = warningMessage;
- fSeverity = IStatus.WARNING;
- }
-
- /**
- * Sets the status to INFO.
- *
- * @param infoMessage
- * The info message (can be empty, but not null)
- */
- public void setInfo(String infoMessage) {
- Assert.isNotNull(infoMessage);
- fStatusMessage = infoMessage;
- fSeverity = IStatus.INFO;
- }
-
- /**
- * Sets the status to OK.
- */
- public void setOK() {
- fStatusMessage = null;
- fSeverity = IStatus.OK;
- }
-
- /*
- * @see IStatus#matches(int)
- */
- public boolean matches(int severityMask) {
- return (fSeverity & severityMask) != 0;
- }
-
- /**
- * Returns always <code>false</code>.
- *
- * @see IStatus#isMultiStatus()
- */
- public boolean isMultiStatus() {
- return false;
- }
-
- /*
- * @see IStatus#getSeverity()
- */
- public int getSeverity() {
- return fSeverity;
- }
-
- /*
- * @see IStatus#getPlugin()
- */
- public String getPlugin() {
- return JSFUICommonPlugin.getPluginId();
- }
-
- /**
- * Returns always <code>null</code>.
- *
- * @see IStatus#getException()
- */
- public Throwable getException() {
- return null;
- }
-
- /**
- * Returns always the error severity.
- *
- * @see IStatus#getCode()
- */
- public int getCode() {
- return fSeverity;
- }
-
- /**
- * Returns always <code>null</code>.
- *
- * @see IStatus#getChildren()
- */
- public IStatus[] getChildren() {
- return new IStatus[0];
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java
deleted file mode 100644
index 6c65dc009..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.DialogPage;
-
-/**
- * copied from org.eclipse.jdt.internal.dialogs. Enhanced to support null status
- * as parameter
- *
- * A utility class to work with IStatus.
- */
-public class StatusUtil {
-
- /**
- * Compares two instances of <code>IStatus</code>. The more severe is
- * returned: An error is more severe than a warning, and a warning is more
- * severe than ok. If the two stati have the same severity, the second is
- * returned.
- *
- * @return Could be null.
- */
- public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
- if (s1 == null && s2 == null) {
- return null;
- } else if (s1 == null) {
- return s2;
- } else if (s2 == null) {
- return s1;
- } else if (s1.getSeverity() > s2.getSeverity()) {
- return s1;
- } else {
- return s2;
- }
- }
-
- /**
- * Finds the most severe status from a array of stati. An error is more
- * severe than a warning, and a warning is more severe than ok.
- *
- * @return could be null
- */
- public static IStatus getMostSevere(IStatus[] status) {
- if (status == null)
- return null;
- IStatus max = null;
- for (int i = 0; i < status.length; i++) {
- IStatus curr = status[i];
- if (curr == null)
- continue;
-
- if (curr.matches(IStatus.ERROR)) {
- return curr;
- }
- if (max == null || curr.getSeverity() > max.getSeverity()) {
- max = curr;
- }
- }
- if (max != null)
- {
- return max;
- }
-
- return null;
- }
-
- /**
- * Applies the status to the status line of a dialog page.
- */
- public static void applyToStatusLine(DialogPage page, IStatus status) {
- if (status == null) {
- page.setMessage(null);
- page.setErrorMessage(null);
- } else {
- String message = status.getMessage();
- switch (status.getSeverity()) {
- case IStatus.OK:
- page.setMessage(message, DialogPage.NONE);
- page.setErrorMessage(null);
- break;
- case IStatus.WARNING:
- page.setMessage(message, DialogPage.WARNING);
- page.setErrorMessage(null);
- break;
- case IStatus.INFO:
- page.setMessage(message, DialogPage.INFORMATION);
- page.setErrorMessage(null);
- break;
- default:
- if (message.length() == 0) {
- message = null;
- }
- page.setMessage(null);
- page.setErrorMessage(message);
- break;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
deleted file mode 100644
index 2afe1f9bb..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field containing a label, text control and a button control.
- */
-public class StringButtonDialogField extends StringDialogField {
- private Button _browseButton;
-
- private String _browseButtonLabel;
-
- private IStringButtonAdapter _stringButtonAdapter;
-
- private boolean _buttonEnabled;
-
- public StringButtonDialogField(IStringButtonAdapter adapter) {
- _stringButtonAdapter = adapter;
- _browseButtonLabel = JSFUICommonPlugin
- .getResourceString("DialogField.Browse");
- _buttonEnabled = true;
- }
-
- /**
- * Sets the label of the button.
- */
- public void setButtonLabel(String label) {
- _browseButtonLabel = label;
- }
-
- // ------ adapter communication
-
- /**
- * Programmatical pressing of the button
- */
- public void changeControlPressed() {
- _stringButtonAdapter.changeControlPressed(this);
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- Text text = getTextControl(toolkit, parent);
- text.setLayoutData(gridDataForText(nColumns - 3));
- Button button = getChangeControl(toolkit, parent);
- button.setLayoutData(gridDataForButton(toolkit, button, text, 1));
-
- return new Control[] { requiredLabel, label, text, button };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 4;
- }
-
- protected static GridData gridDataForButton(FormToolkit toolkit,
- Button button, Text text, int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- // gd.heightHint = SWTUtil.getButtonHeightHint(button);
- gd.widthHint = LayoutUtil.getButtonWidthHint(button);
- gd.heightHint = LayoutUtil.getButtonHeightHint(toolkit, text);
- return gd;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created buttom widget.
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- */
- public Button getChangeControl(FormToolkit toolkit, Composite parent) {
- if (_browseButton == null) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _browseButton = toolkit.createButton(parent,
- _browseButtonLabel, SWT.PUSH);
- } else {
- _browseButton = new Button(parent, SWT.PUSH);
- _browseButton.setText(_browseButtonLabel);
- }
- _browseButton.setEnabled(isEnabled() && _buttonEnabled);
- _browseButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- changeControlPressed();
- }
-
- public void widgetSelected(SelectionEvent e) {
- changeControlPressed();
- }
- });
-
- }
- return _browseButton;
- }
-
- // ------ enable / disable management
-
- /**
- * Sets the enable state of the button.
- */
- public void enableButton(boolean enable) {
- if (isOkToUse(_browseButton)) {
- _browseButton.setEnabled(isEnabled() && enable);
- }
- _buttonEnabled = enable;
- }
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_browseButton)) {
- _browseButton.setEnabled(isEnabled() && _buttonEnabled);
- }
- }
-
- /**
- * @return Returns the _stringButtonAdapter.
- */
- public IStringButtonAdapter getStringButtonAdapter() {
- return _stringButtonAdapter;
- }
-
- /**
- * @param buttonAdapter
- * The _stringButtonAdapter to set.
- */
- public void setStringButtonAdapter(IStringButtonAdapter buttonAdapter) {
- _stringButtonAdapter = buttonAdapter;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
deleted file mode 100644
index 499ddbef6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-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.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.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field containing a label and a text control.
- */
-public class StringDialogField extends DialogFieldBase implements
- ISupportTextValue {
- final static private int TEXT_WIDTH_HINT = 10;
-
- private String _text;
-
- private Text _textControl;
-
- private ModifyListener _modifyListener;
-
- private int _numRows = 1;
-
- /**
- * whether there is change in the UI but not fire applied event yet.
- */
- private boolean _pending = false;
-
- public StringDialogField() {
- super();
- _text = ""; //$NON-NLS-1$
- }
-
- public StringDialogField(int numRows) {
- super();
- _text = ""; //$NON-NLS-1$
- _numRows = numRows;
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit kit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(kit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(kit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- Text text = getTextControl(kit, parent);
- int heightHint = -1;
- if (_numRows > 1) {
- heightHint = getDialogUnits(parent).getHeight() * _numRows;
- }
- text.setLayoutData(gridDataForText(nColumns - 2, heightHint));
-
- return new Control[] { requiredLabel, label, text };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- protected static GridData gridDataForLabel(int span) {
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = span;
- return gd;
- }
-
- protected static GridData gridDataForText(int span, int heightHint) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.heightHint = heightHint;
- gd.horizontalSpan = span;
- gd.widthHint = TEXT_WIDTH_HINT;
- return gd;
- }
-
- protected static GridData gridDataForText(int span) {
- GridData gd = gridDataForText(span, -1);
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_textControl)) {
- _textControl.setFocus();
- _textControl.setSelection(0, _textControl.getText().length());
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created text control.
- *
- * @param parent
- * The parent composite or <code>null</code> when the widget
- * has already been created.
- */
- public Text getTextControl(FormToolkit toolkit, Composite parent) {
- if (_textControl == null) {
- assertCompositeNotNull(parent);
- _modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- doModifyText(e);
- }
- };
-
- if (toolkit != null) {
- if (_numRows <= 1) {
- _textControl = toolkit.createText(parent, "");
- } else {
- _textControl = toolkit.createText(parent, "", SWT.V_SCROLL);
- }
- } else {
- if (_numRows <= 1) {
-
- _textControl = new Text(parent, SWT.SINGLE | SWT.BORDER);
- } else {
- _textControl = new Text(parent, SWT.V_SCROLL | SWT.WRAP
- | SWT.BORDER);
- }
- }
-
- _textControl.setText(_text);
- _textControl.setFont(parent.getFont());
- _textControl.addModifyListener(_modifyListener);
- _textControl.addFocusListener(new FocusAdapter() {
-
- public void focusLost(FocusEvent e) {
- doFocusLost(e);
- }
-
- });
- _textControl.addKeyListener(new KeyAdapter() {
- public void keyReleased(KeyEvent e) {
- doKeyReleased(e);
- }
- });
-
- _textControl.setEnabled(isEnabled());
-
- _textControl.setToolTipText(getToolTip());
- }
- return _textControl;
- }
-
- protected void doKeyReleased(KeyEvent e) {
- if (e.character == '\r') {
- // commit value
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
- }
-
- protected void doFocusLost(FocusEvent e) {
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- /**
- * some get changed in the Text. As in <code>setText</code> and
- * <code>setTextWithoutUpdate</code> we removed the listener, so this must
- * be user typing in the text field.
- *
- * @param e
- */
- private void doModifyText(ModifyEvent e) {
- if (isOkToUse(_textControl)) {
- _text = _textControl.getText();
- }
- _pending = true;
- dialogFieldChanged();
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_textControl)) {
- _textControl.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Gets the text. Can not be <code>null</code>
- */
- public String getText() {
- return _text;
- }
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setText(String text) {
- setTextWithoutUpdate(text);
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setTextWithoutUpdate(String text) {
- // reset _pending state.
- _pending = false;
-
- if (text == null)
- text = "";
- _text = text;
- if (isOkToUse(_textControl)) {
- _textControl.removeModifyListener(_modifyListener);
- _textControl.setText(text);
- _textControl.addModifyListener(_modifyListener);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(_textControl, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
deleted file mode 100644
index a2079e56f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Map.Entry;
-
-import org.eclipse.jst.jsf.common.ui.internal.utils.StyleCombo;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-public class StyleComboDialogField extends DialogFieldBase implements
- ISupportTextValue {
- final static private int WIDTH_HINT = 10;
-
- private String _text;
-
- private int _selectionIndex;
-
- private String[] _items;
-
- private StyleCombo _comboControl;
-
- private ModifyListener _modifyListener;
-
- private int _flags;
-
- private boolean _pending = false;
-
- private Map _entryMap;
-
- private String _defaultValue;
-
- public String getDefaultValue() {
- return _defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this._defaultValue = defaultValue;
- }
-
- public StyleComboDialogField(int flags) {
- super();
- _text = ""; //$NON-NLS-1$
- _items = new String[0];
- _flags = flags;
- _selectionIndex = -1;
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- StyleCombo combo = getComboControl(toolkit, parent);
- combo.setLayoutData(gridDataForCombo(nColumns - 2));
-
- return new Control[] { requiredLabel, label, combo };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- protected static GridData gridDataForCombo(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.widthHint = WIDTH_HINT;
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_comboControl)) {
- _comboControl.setFocus();
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created combo control.
- *
- * @param parent
- * The parent composite or <code>null</code> when the widget
- * has already been created.
- */
- public StyleCombo getComboControl(FormToolkit toolkit,
- final Composite parent) {
- if (_comboControl == null) {
- assertCompositeNotNull(parent);
- _modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- doModifyText(e);
- }
- };
- SelectionListener selectionListener = new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- doSelectionChanged(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- handleDefaultSelection(e);
- }
- };
-
- if (toolkit != null) {
- _comboControl = new StyleCombo(parent, _flags);
- final FormColors colors = new FormColors(parent.getDisplay());
- parent.addPaintListener(new PaintListener() {
-
- public void paintControl(PaintEvent event) {
- Composite composite = (Composite) event.widget;
- Control[] children = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- Control c = children[i];
- if (!(c instanceof StyleCombo) || !c.isVisible()) {
- continue;
- }
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(colors.getBorderColor());
- gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1,
- b.height + 1);
- }
- }
- });
-
- // when the parent is disposed, the colors should no
- // no longer be needed.
- parent.addDisposeListener(new DisposeListener()
- {
- public void widgetDisposed(DisposeEvent e) {
- colors.dispose();
- }
- }
- );
- toolkit.adapt(_comboControl);
- } else {
- _comboControl = new StyleCombo(parent, _flags | SWT.BORDER);
- _comboControl.setBackground(Display.getCurrent()
- .getSystemColor(SWT.COLOR_LIST_BACKGROUND));
- }
-
- // moved up due to 1GEUNW2
- _comboControl.setItems(_items);
- _comboControl.setDefaultValue(_defaultValue);
- if (_selectionIndex != -1) {
- _comboControl.select(_selectionIndex);
- } else {
- _comboControl.setText(_text);
- }
- _comboControl.setFont(parent.getFont());
- _comboControl.addModifyListener(_modifyListener);
- _comboControl.addSelectionListener(selectionListener);
- _comboControl.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- doFocusLost(e);
- }
- });
- _comboControl.setEnabled(isEnabled());
- _comboControl.setToolTipText(getToolTip());
- }
- return _comboControl;
- }
-
- protected void handleDefaultSelection(SelectionEvent e) {
- // commit value
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- protected void doFocusLost(FocusEvent e) {
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- private void doModifyText(ModifyEvent e) {
- if (isOkToUse(_comboControl)) {
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = true;
- dialogFieldChanged();
- }
-
- private void doSelectionChanged(SelectionEvent e) {
- if (isOkToUse(_comboControl)) {
- _items = _comboControl.getItems();
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_comboControl)) {
- _comboControl.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Gets the combo items.
- */
- public String[] getItems() {
- return _items;
- }
-
- /**
- * Sets the combo items. Triggers a dialog-changed event.
- */
- public void setItems(String[] items) {
- _items = items;
- if (isOkToUse(_comboControl)) {
- _comboControl.setItems(items);
- }
- _pending = false;
- // dialogFieldChangedAndApplied();
- }
-
- public void setEntryMap(Map map) {
- this._entryMap = map;
- if (_entryMap == null) {
- _entryMap = new TreeMap();
- }
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- String[] items = new String[entries.length];
- for (int i = 0; i < entries.length; i++) {
- items[i] = entries[i].getValue().toString();
- }
- setItems(items);
- }
-
- /**
- * Gets the text.
- */
- public String getText() {
- return _text;
- }
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setText(String text) {
- setTextWithoutUpdate(text);
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Selects an item.
- */
- public void selectItem(int index) {
- if (isOkToUse(_comboControl)) {
- _comboControl.select(index);
- } else {
- if (index >= 0 && index < _items.length) {
- _text = getEntryKey(_items[index]);
- _selectionIndex = index;
- }
- }
- dialogFieldChangedAndApplied();
- }
-
- public int getSelectionIndex() {
- return _selectionIndex;
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setTextWithoutUpdate(String text) {
- _pending = false;
- if (text == null) {
- text = "";//$NON-NLS-1$
- }
- _text = text;
- if (isOkToUse(_comboControl)) {
- _comboControl.removeModifyListener(_modifyListener);
- _comboControl.setText(getEntryValue(text));
- _comboControl.addModifyListener(_modifyListener);
- }
- }
-
- private String getEntryValue(String key) {
- if (_entryMap == null || !_entryMap.containsKey(key)) {
- return key;
- }
- return _entryMap.get(key).toString();
- }
-
- private String getEntryKey(String value) {
- if (_entryMap == null || !_entryMap.containsValue(value)) {
- return value;
- }
-
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getValue() == value
- || (value != null && value.equals(entries[i].getValue()))) {
- return entries[i].getKey().toString();
- }
- }
- return value;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(_comboControl, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java
deleted file mode 100644
index 6ec055ee6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Implementation of a <code>ISelectionValidator</code> to validate the type
- * of an element. Empty selections are not accepted.
- *
- * @author mengbo
- * @version 1.5
- */
-public class TypedElementSelectionValidator implements
- ISelectionStatusValidator {
-
- private IStatus _fgErrorStatus = new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$
-
- private IStatus _fgOKStatus = new StatusInfo();
-
- private Class[] _fAcceptedTypes;
-
- private boolean _fAllowMultipleSelection;
-
- private Collection _fRejectedElements;
-
- /**
- * @param acceptedTypes
- * The types accepted by the validator
- * @param allowMultipleSelection
- * If set to <code>true</code>, the validator allows multiple
- * selection.
- */
- public TypedElementSelectionValidator(Class[] acceptedTypes,
- boolean allowMultipleSelection) {
- this(acceptedTypes, allowMultipleSelection, null);
- }
-
- /**
- * @param acceptedTypes
- * The types accepted by the validator
- * @param allowMultipleSelection
- * If set to <code>true</code>, the validator allows multiple
- * selection.
- * @param rejectedElements
- * A list of elements that are not accepted
- */
- public TypedElementSelectionValidator(Class[] acceptedTypes,
- boolean allowMultipleSelection, Collection rejectedElements) {
- Assert.isNotNull(acceptedTypes);
- _fAcceptedTypes = acceptedTypes;
- _fAllowMultipleSelection = allowMultipleSelection;
- _fRejectedElements = rejectedElements;
- }
-
- /*
- * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
- */
- public IStatus validate(Object[] elements) {
- if (isValid(elements)) {
- return _fgOKStatus;
- }
- return _fgErrorStatus;
- }
-
- private boolean isOfAcceptedType(Object o) {
- for (int i = 0; i < _fAcceptedTypes.length; i++) {
- if (_fAcceptedTypes[i].isInstance(o)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean isRejectedElement(Object elem) {
- return (_fRejectedElements != null)
- && _fRejectedElements.contains(elem);
- }
-
- private boolean isValid(Object[] selection) {
- if (selection.length == 0) {
- return false;
- }
-
- if (!_fAllowMultipleSelection && selection.length != 1) {
- return false;
- }
-
- for (int i = 0; i < selection.length; i++) {
- Object o = selection[i];
- if (!isOfAcceptedType(o) || isRejectedElement(o)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java
deleted file mode 100644
index 584f99b24..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogfield;
-
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-/**
- * Viewer filter used in selection dialogs.
- *
- * @author mengbo
- * @version 1.5
- */
-public class TypedViewerFilter extends ViewerFilter {
-
- private Class[] _fAcceptedTypes;
-
- private Object[] _fRejectedElements;
-
- /**
- * Creates a filter that only allows elements of gives types.
- *
- * @param acceptedTypes
- * The types of accepted elements
- */
- public TypedViewerFilter(Class[] acceptedTypes) {
- this(acceptedTypes, null);
- }
-
- /**
- * Creates a filter that only allows elements of gives types, but not from a
- * list of rejected elements.
- *
- * @param acceptedTypes
- * Accepted elements must be of this types
- * @param rejectedElements
- * Element equals to the rejected elements are filtered out
- */
- public TypedViewerFilter(Class[] acceptedTypes, Object[] rejectedElements) {
- Assert.isNotNull(acceptedTypes);
- _fAcceptedTypes = acceptedTypes;
- _fRejectedElements = rejectedElements;
- }
-
- /**
- * @see ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (_fRejectedElements != null) {
- for (int i = 0; i < _fRejectedElements.length; i++) {
- if (element.equals(_fRejectedElements[i])) {
- return false;
- }
- }
- }
- for (int i = 0; i < _fAcceptedTypes.length; i++) {
- if (_fAcceptedTypes[i].isInstance(element)) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java
deleted file mode 100644
index 48f5cb99a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * This dialog shows IFile type resources within a IProject domain for
- * selection. The client can prvide the suffixs of files to filter when
- * candidates are shown on the tree.
- *
- * The usage: Shell shell = new Shell(); IProject project = getProject();
- * CommonResourceDialog dlg = new CommonResourceDialog(shell, project);
- * dlg.setResourceDescription("image"); dlg.setSuffixs(new
- * String[]{"bmp","jpg","gif"}); if(dlg.open() == Window.OK) { IFile
- * selectedFile = (IFile)dlg.getResult()[0]; }
- *
- * Note: In code above, what you get is an absolute resource path. You can use
- * <code>org.eclipse.wst.sse.core.util.PathHelper.convertToRelative(String input, String base)</code>
- * to convert a absolute resource path to a relative path based on one path.
- *
- * @author mengbo
- */
-public class CommonResourceDialog extends TreeViewerSelectionDialog {
- private static Logger _log = JSFUICommonPlugin
- .getLogger(CommonResourceDialog.class);
-
- // private static final String STATUS_MESSAGE_0 = CommonPlugin
- // .getResourceString("Dialog.CommonResourceDialog.StatusMessage0");
- // //$NON-NLS-1$
-
- private IProject _project = null;
-
- private String _suffixs[] = null;
-
- private CommonResourceFilter _filter = null;
-
- // The resource type resourceDescription, such as "image", "jsp", "java
- // class" etc.
- private String _resourceDescription = null;
-
- private IFolder _folder;
-
- // The content provider
- class ProjectFileDialogContentProvider implements ITreeContentProvider {
- /**
- * The visual part that is using this content provider is about to be
- * disposed. Deallocate all allocated SWT resources.
- */
- public void dispose() {
- // nothing to dispose
- }
-
- /**
- * @see ITreeContentProvider#getChildren
- */
- public Object[] getChildren(Object element) {
- if (element instanceof Object[]) {
- return (Object[]) element;
- } else if (element instanceof IContainer) {
- IContainer container = (IContainer) element;
- if (container.isAccessible()) {
- try {
- return container.members();
- } catch (CoreException e) {
- _log.error(
- "Error.ProjectFileDialogContentProvider.0", e); //$NON-NLS-1$
- }
- }
-
- }
- return new Object[0];
- }
-
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object element) {
- return getChildren(element);
- }
-
- /**
- * @see ITreeContentProvider#getParent
- */
- public Object getParent(Object element) {
- if (element instanceof IResource) {
- return ((IResource) element).getParent();
- }
- return null;
- }
-
- /**
- * @see ITreeContentProvider#hasChildren
- */
- public boolean hasChildren(Object element) {
- return getChildren(element).length > 0;
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // no viewer change support required
- }
-
- }
-
- // The default resource filter
- class CommonResourceFilter extends ViewerFilter {
- private String _suffixs[] = null;
-
- Logger _log = JSFUICommonPlugin.getLogger(CommonResourceFilter.class);
-
- /**
- * @return Returns the _suffixs.
- */
- public String[] getSuffixs() {
- return _suffixs;
- }
-
- /**
- * @param _suffixs
- * The _suffixs to set.
- */
- public void setSuffixs(String[] _suffixs) {
- this._suffixs = _suffixs;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- if (element instanceof IFile) {
- IFile file = (IFile) element;
- if (!WebrootUtil.isUnderWebContentFolder(file)) {
- return false;
- }
- if (isSuffixBlank()) {
- return true;
- }
- if (file.getFileExtension() != null) {
- if (Arrays.asList(_suffixs).contains(
- file.getFileExtension().toLowerCase())) {
- return true;
- }
- }
- } else if (element instanceof IContainer) {
- if (!((IContainer) element).isAccessible()) {
- return false;
- }
- if (element instanceof IProject) {
- return true;
- } else if (element instanceof IFolder) {
- IContainer container = (IContainer) element;
- try {
- IResource[] members = container.members();
- for (int i = 0; i < members.length; i++) {
- if (select(viewer, members[i].getParent(),
- members[i])) {
- return true;
- }
- }
- } catch (CoreException e) {
- _log.error(
- "Error.ProjectFileDialogContentProvider.0", e); //$NON-NLS-1$
- return false;
- }
- }
- }
- return false;
- }
-
- }
-
- /**
- * This is a dialog for common resource selection, the resouce supported
- * include IFolder, IProject, IFile, user can provide
- *
- * @param parentShell
- * @param project
- */
- public CommonResourceDialog(Shell parentShell, IProject project, int style) {
- super(parentShell, "", style);
- if (project == null) {
- throw new IllegalArgumentException(
- "Argument(project) cannot be null");
- }
- _project = project;
- setContentProvider(new ProjectFileDialogContentProvider());
- setLabelProvider(WorkbenchLabelProvider
- .getDecoratingWorkbenchLabelProvider());
- _filter = new CommonResourceFilter();
- setFilter(_filter);
- _project = project;
- setStatusMessage(getStatusMessage());
- }
-
- public CommonResourceDialog(Shell parentShell, IProject project) {
- this(parentShell, project, SWT.NONE);
- }
-
- /**
- * This is a dialog for common resource selection, the resouce supported
- * include IFolder, IProject, IFile, user can provide
- *
- * @param parentShell
- * @param folder
- * @param style
- */
- public CommonResourceDialog(Shell parentShell, IFolder folder, int style) {
- this(parentShell, (folder == null ? null : folder.getProject()), style);
-
- _folder = folder;
-
- }
-
- protected String getStatusMessage() {
- if (_resourceDescription == null) {
- return "";
- }
- return _resourceDescription;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.ui.common.SelectionTreeViewerDialog#findInputElement()
- */
- protected Object findInputElement() {
- if (_folder != null) {
- return new Object[] { _folder, };
- }
- return new Object[] { _project, };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.ui.common.SelectionTreeViewerDialog#isValidSelection(java.lang.Object)
- */
- protected boolean isValidSelection(Object selection) {
- if (selection instanceof Object[]) {
- for (int i = 0, n = ((Object[]) selection).length; i < n; i++) {
- if (isValidElement(((Object[]) selection)[i]) == true) {
- return true;
- }
- }
- return false;
- }
- return isValidElement(selection);
- }
-
- private boolean isValidElement(Object selection) {
- if ((selection instanceof IFile)) {
- // Null means no filter is set
- if (isSuffixBlank()) {
- return true;
- }
- // The extension is supported?
- else if (_suffixs != null
- && Arrays.asList(_suffixs).contains(
- ((IFile) selection).getFileExtension()
- .toLowerCase())) {
- return true;
- }
- }
- // None of above conditions, invalid.
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.dialogs.SelectionDialog#getResult()
- */
- public Object[] getResult() {
- Object[] objects = super.getResult();
- if (objects == null || objects.length == 0) {
- return null;
- }
- List list = new ArrayList();
- for (int i = 0; i < objects.length; i++) {
- if (objects[i] instanceof IFile) {
- list.add(objects[i]);
- }
- }
- return list.toArray();
- }
-
- /**
- * @param suffixs
- * The suffixs to set.
- */
- public void setSuffixs(String[] suffixs) {
- this._suffixs = convertTolowercase(suffixs);
- _filter.setSuffixs(_suffixs);
- setStatusMessage(getStatusMessage());
- }
-
- private String[] convertTolowercase(String[] suffixs) {
- if (suffixs != null) {
- String[] newSuffixs = new String[suffixs.length];
- for (int i = 0; i < suffixs.length; i++) {
- newSuffixs[i] = suffixs[i].toLowerCase();
- }
- return newSuffixs;
- }
- return null;
- }
-
- public void setFilter(String[] suffixs, String sourceDescription) {
- setSuffixs(suffixs);
- setResourceDescription(sourceDescription);
- }
-
- /**
- * @return Returns the sourceDescription.
- */
- public String getResourceDescription() {
- return _resourceDescription;
- }
-
- /**
- * @param sourceDescription
- * The sourceDescription to set.
- */
- public void setResourceDescription(String sourceDescription) {
- this._resourceDescription = sourceDescription;
- setStatusMessage(getStatusMessage());
- }
-
- private boolean isSuffixBlank() {
- boolean isSuffixBlank = false;
- if (_suffixs == null) {
- isSuffixBlank = true;
- } else {
- int count = 0;
- for (int i = 0, size = _suffixs.length; i < size; i++) {
- if (_suffixs[i] != null && !"".equals(_suffixs[i])) {
- count++;
- break;
- }
- }
- if (count == 0) {
- isSuffixBlank = true;
- }
- }
- return isSuffixBlank;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java
deleted file mode 100644
index 63202d929..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-public class CommonWizardDialog extends WizardDialog {
-
- public CommonWizardDialog(Shell parentShell, IWizard newWizard) {
- super(parentShell, newWizard);
- }
-
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
-
- IWizard wizard = getWizard();
- if (!wizard.needsPreviousAndNextButtons()) {
- getButton(IDialogConstants.FINISH_ID).setText(
- IDialogConstants.OK_LABEL);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java
deleted file mode 100644
index 77d802d4e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogs;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.JarEntryFile;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.utils.PathUtil;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This dialog will let client to select resources that located on a
- * IJavaProject classpath, the client can provide a list of files suffixs to
- * filter.
- *
- * @author mengbo
- */
-// TODO: Since many jar files might do nothing to do with client's selection, we
-// may need to provides more filter choice
-// to clients to exclude unnecessary jar files, such as that are located in JDK
-// dir.
-public class ResourceOnClasspathDialog extends TreeViewerSelectionDialog {
- // ResourcesOnClasspathDialog.statusMessage = Please select a property file
- private static final String STATUS_MESSAGE = JSFUICommonPlugin
- .getResourceString("Dialog.ResourceOnClasspathDialog.StatusMessage"); //$NON-NLS-1$
-
- private IJavaProject _javaProject;
-
- // the suffixs of files that can be selected
- private String _suffixs[];
-
- // IJMTConstants.DEFAULT_SUFFIX;
-
- private ResourceOnClasspathFilter _filter;
-
- // Client doesn't need to know it.
- class ResourceOnClasspathFilter extends ViewerFilter {
- StandardJavaElementContentProvider _javaContentProvider;
-
- public ResourceOnClasspathFilter(
- StandardJavaElementContentProvider contentProvider) {
- _javaContentProvider = contentProvider;
- }
-
- /**
- * Set the suffixs of files need to be selected.
- *
- * @param suffixs
- */
- public void setSuffixs(String suffixs[]) {
- _suffixs = suffixs;
- }
-
- /**
- * @param contentProvider
- * The _javaContentProvider to set.
- */
- public void setJavaContentProvider(
- StandardJavaElementContentProvider contentProvider) {
- _javaContentProvider = contentProvider;
- }
-
- /**
- * @param project
- * The _javaProject to set.
- */
- public void setJavaProject(IJavaProject project) {
- _javaProject = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- // TODO: This logic can be improved by add caching mechanism
- if (element instanceof IJavaProject) {
- String currentProjectName = ((IJavaProject) element)
- .getProject().getFullPath().toString().trim();
- String projectName = _javaProject.getProject().getFullPath()
- .toString().trim();
- if (projectName.equalsIgnoreCase(currentProjectName)) {
- return true;
- }
- return false;
- } else if (element instanceof IResource) {
- if (((_javaProject != null) && !_javaProject
- .isOnClasspath((IResource) element))) {
- return false;
- }
- if (element instanceof IFile) {
- if (Arrays.asList(_suffixs).contains(
- ((IFile) element).getFileExtension())) {
- return true;
- }
- }
- return false;
- }
- // XXX: JarEntryFile is for internal use.
- if (element instanceof JarEntryFile) {
- String ext = ((JarEntryFile) element).getFullPath()
- .getFileExtension();
- if (ext != null && Arrays.asList(_suffixs).contains(ext)) {
- return true;
- }
- return false;
- }
- if (!(element instanceof IJavaElement)) {
- return false;
- }
- if (((_javaProject != null) && !_javaProject
- .isOnClasspath((IJavaElement) element))) {
- return false;
- }
- IJavaElement javaElement = (IJavaElement) element;
- Object[] children = null;
- switch (javaElement.getElementType()) {
- case IJavaElement.PACKAGE_FRAGMENT_ROOT:
- children = _javaContentProvider.getChildren(javaElement);
- break;
- case IJavaElement.IMPORT_CONTAINER:
- return true;
- case IJavaElement.PACKAGE_FRAGMENT:
- children = _javaContentProvider.getChildren(javaElement);
- break;
- case IJavaElement.CLASS_FILE:
- if (Arrays.asList(_suffixs).contains(
- IFileFolderConstants.EXT_CLASS)) {
- return true;
- }
- return false;
- case IJavaElement.COMPILATION_UNIT:
- String ext = javaElement.getPath().getFileExtension();
- if (ext != null && Arrays.asList(_suffixs).contains(ext)) {
- return true;
- }
- return false;
- default:
- return false;
- }
-
- for (int i = 0; i < children.length; i++) {
- if (select(viewer, javaElement, children[i])) {
- return true;
- }
- }
- // Either the resouce or its children are not for displaying.
- return false;
- }
- }
-
- /**
- * Set the suffixs of files need to be selected.
- *
- * @param suffixs
- */
- public void setSuffixs(String suffixs[]) {
- _suffixs = suffixs;
- _filter.setSuffixs(suffixs);
- }
-
- /**
- * @param parentShell
- * @param project
- */
- public ResourceOnClasspathDialog(Shell parentShell, IJavaProject project) {
- super(parentShell, STATUS_MESSAGE);
- // set provider and filter
- StandardJavaElementContentProvider contentProvider = new StandardJavaElementContentProvider();
- setContentProvider(contentProvider);
- setLabelProvider(new JavaElementLabelProvider());
- _filter = new ResourceOnClasspathFilter(contentProvider);
- setFilter(_filter);
- // store the project
- _javaProject = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.dialogs.SelectionDialog#getResult()
- */
- public Object[] getResult() {
- Object[] objects = super.getResult();
- if (objects == null || objects.length == 0) {
- return null;
- }
- IPath path = PathUtil.getPathOnClasspath(_javaProject, objects[0]);
- String result = null;
- if (path.segmentCount() == 0) {
- return new Object[] { "" };
- }
- path = path.removeFileExtension();
- result = path.toOSString();
- result = result.replace(File.separatorChar, '.');
- return new Object[] { result };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.ui.common.SelectionTreeViewerDialog#isValidSelection()
- */
- protected boolean isValidSelection(Object selection) {
- String extension = PathUtil.getPathOnClasspath(_javaProject, selection)
- .getFileExtension();
- return (extension != null && Arrays.asList(_suffixs).contains(extension));
- }
-
- protected Object findInputElement() {
- Object input = ResourcesPlugin.getWorkspace();
- if (input instanceof IWorkspace) {
- return JavaCore.create(((IWorkspace) input).getRoot());
- } else if (input instanceof IContainer) {
- IJavaElement element = JavaCore.create((IContainer) input);
- if (element != null && element.exists()) {
- return element;
- }
- return input;
- }
- return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java
deleted file mode 100644
index 492353375..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-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.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-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.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.part.DrillDownComposite;
-
-/**
- * This is a base dialog that uses TreeViewer to show selections, subclass needs
- * to provide IContentProvider, ILabelProvider and ViewerFilter for the
- * TreeViewer. Subclass needs to implement isValidSelection(), which valids the
- * selection, and findInputElement() which provides the root element of the
- * tree. Besides, subclass might need to implement getResult() to return a
- * customized result.
- *
- * @author mengbo
- *
- */
-public abstract class TreeViewerSelectionDialog extends SelectionDialog {
- private static final String DEFAULT_TITLE = JSFUICommonPlugin
- .getResourceString("Dialog.TreeViewerSelectionDialog.DefaultTitle"); //$NON-NLS-1$
-
- /** Used to tag the image type */
- public static final int STYLE_NONE = 0;
-
- public static final int STYLE_INFORMATION = 1;
-
- public static final int STYLE_ERROR = 2;
-
- public static final int STYLE_WARNING = 3;
-
- /** Sizi of the TreeViewer composite */
- private static final int SIZING_SELECTION_PANE_HEIGHT = 300;
-
- private static final int SIZING_SELECTION_PANE_WIDTH = 320;
-
- private String _title = DEFAULT_TITLE;
-
- // the seleciton on the treeviewer.
- private static Object[] _selection;
-
- // providers
- private ITreeContentProvider _contentProvider;
-
- private ILabelProvider _labelProvider;
-
- private ViewerFilter _filter;
-
- /** The validation image */
- private Label _statusImage;
-
- /** The validation message */
- private Label _statusLabel;
-
- private String _statusMessage;
-
- /** The selection tree */
- private TreeViewer _treeViewer;
-
- private int _style;
-
- private ViewerSorter _viewerSorter = null;
-
- /**
- * @param parentShell
- */
- public TreeViewerSelectionDialog(Shell parentShell, String statusMessage,
- int style) {
- super(parentShell);
- _statusMessage = statusMessage;
- _style = style;
- setShellStyle(SWT.CLOSE | SWT.TITLE | SWT.BORDER
- | SWT.APPLICATION_MODAL | SWT.RESIZE);
- }
-
- public TreeViewerSelectionDialog(Shell parentShell, String statusMessage) {
- this(parentShell, statusMessage, SWT.NONE);
- }
-
- public void setTitle(String title) {
- super.setTitle(title);
- _title = title;
- }
-
- /**
- * Returns a new drill down viewer for this dialog.
- * @param parent
- */
- protected void createTreeViewer(Composite parent) {
- // Create drill down
- DrillDownComposite drillDown = new DrillDownComposite(parent,
- SWT.BORDER);
- GridData spec = new GridData(GridData.FILL_BOTH);
- spec.widthHint = SIZING_SELECTION_PANE_WIDTH;
- spec.heightHint = SIZING_SELECTION_PANE_HEIGHT;
- drillDown.setLayoutData(spec);
- _treeViewer = new TreeViewer(drillDown, _style);
- drillDown.setChildTree(_treeViewer);
- }
-
- private void setTreeViewerProviders() {
- _treeViewer.setContentProvider(_contentProvider);
- _treeViewer.setLabelProvider(_labelProvider);
- if (_viewerSorter == null) {
- _viewerSorter = new ViewerSorter();
- }
- _treeViewer.setSorter(_viewerSorter);
- _treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- _selection = getSelectedElements((IStructuredSelection) event
- .getSelection());
- updateStatus();
- }
- });
- _treeViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection) {
- Object item = ((IStructuredSelection) selection)
- .getFirstElement();
- if (item instanceof IFile) {
- okPressed();
- } else if (_treeViewer.getExpandedState(item)) {
- _treeViewer.collapseToLevel(item, 1);
- } else {
- _treeViewer.expandToLevel(item, 1);
- }
- }
- }
- });
- _treeViewer.setInput(findInputElement());
-
- if (_filter != null) {
- _treeViewer.addFilter(_filter);
- }
- }
-
- /**
- * Creates the contents of the composite.
- */
- public void createTreeViewerComposite(Composite parent) {
- Composite treeViewerComposite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- treeViewerComposite.setLayout(layout);
-
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- treeViewerComposite.setLayoutData(gridData);
- Label label = new Label(treeViewerComposite, SWT.WRAP);
- label.setText(_title);
- label.setFont(treeViewerComposite.getFont());
- createTreeViewer(treeViewerComposite);
- Dialog.applyDialogFont(treeViewerComposite);
- }
-
- /**
- * Sets the selected existing container.
- * @param selection
- */
- public void setSelectedElement(Object[] selection) {
- // Expand to and select the specified container
- if (selection == null) {
- return;
- }
-
- for (int i = 0; i < selection.length; i++) {
- if (_selection[i] != null) {
- _treeViewer.expandToLevel(_selection[i], 1);
-
- }
- }
- _treeViewer.setSelection(new StructuredSelection(selection), true);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected Control createDialogArea(Composite parent) {
- Composite area = (Composite) super.createDialogArea(parent);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- area.setLayout(gridLayout);
-
- // Container treeviewer composite
- createTreeViewerComposite(area);
-
- _statusImage = createLabel(area);
- _statusImage.setImage(getMessageImage(STYLE_ERROR));
- _statusLabel = createLabel(area);
- // Link to model
- setTreeViewerProviders();
-
- return dialogArea;
- }
-
- 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);
- label.setText(_statusMessage == null ? "" : _statusMessage); //$NON-NLS-1$
- return label;
- }
-
- private Object[] getSelectedElements(IStructuredSelection selection) {
- return selection.toArray();
- }
-
- /**
- * @param provider
- * The _contentProvider to set.
- */
- public void setContentProvider(ITreeContentProvider provider) {
- _contentProvider = provider;
- }
-
- /**
- * @param provider
- * The _labelProvider to set.
- */
- public void setLabelProvider(ILabelProvider provider) {
- _labelProvider = provider;
- }
-
- /**
- * @param filter
- * The _filter to set.
- */
- public void setFilter(ViewerFilter filter) {
- this._filter = filter;
- }
-
- /**
- * @param sorter
- * The _viewerSorter to set.
- */
- public void setViewerSorter(ViewerSorter sorter) {
- _viewerSorter = sorter;
- }
-
- public void setStatusMessage(String message) {
- _statusMessage = message;
- }
-
- /**
- * Update the status message
- */
- private void updateStatus() {
- Object selection = _selection;
- if (_selection != null && _selection.length == 1) {
- selection = _selection[0];
- }
- if (isValidSelection(selection)) {
- _statusImage.setVisible(false);
- _statusLabel.setText(""); //$NON-NLS-1$
- getOkButton().setEnabled(true);
- } else {
- _statusImage.setVisible(true);
- _statusImage.setImage(getMessageImage(STYLE_ERROR));
- _statusImage.redraw();
- _statusLabel.setText(_statusMessage);
- getOkButton().setEnabled(false);
- }
-
- }
-
- /**
- * Get the different message according the message type.
- *
- * @return Image - the message image
- */
- protected Image getMessageImage(int imageType) {
- switch (imageType) {
- case STYLE_ERROR:
- return JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_ERROR);
- case STYLE_WARNING:
- return JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING);
- case STYLE_INFORMATION:
- return JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_INFO);
- default:
- return null;
- }
- }
-
- /**
- * The <code>ContainerSelectionDialog</code> implementation of this
- * <code>Dialog</code> method builds a list of the selected resource
- * containers for later retrieval by the client and closes this dialog.
- */
- protected void okPressed() {
- List chosenContainerPathList = new ArrayList();
- if (_selection != null) {
- chosenContainerPathList.addAll(Arrays.asList(_selection));
- }
- setResult(chosenContainerPathList);
- super.okPressed();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
- Control control = super.createContents(parent);
- if (_selection != null) {
- this.setSelectedElement(_selection);
- }
- return control;
- }
-
- protected abstract boolean isValidSelection(Object selection);
-
- protected abstract Object findInputElement();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java
deleted file mode 100644
index c416e71e7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java
+++ /dev/null
@@ -1,835 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-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.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * This class will provide UI alert dialogs to the user. These will
- * automatically get the message from the plugin's resource bundle.
- *
- * NOTE: there are some generic exception methods included in this file. They
- * need resource bundles also, and they make the alerts bettern when the
- * exception is caught at a later stage.
- *
- * @author mengbo
- */
-public class Alerts {
- // this is used for junit testing to turn off all alerts and return the
- // default on yes/no dialogs.
- public static boolean _noAlerts = false;
-
- private ResourceBundle _rb;
-
- private String _pluginId;
-
- /**
- * Construct a alerts with the provided attributes. This constructor should
- * be used from the root plugin that has access to the resource bundle for
- * this plugin.
- *
- * @param plugin
- * @param rb
- * the resource bundle to use.
- */
- public Alerts(AbstractUIPlugin plugin, ResourceBundle rb) {
- _rb = rb;
- if (_rb == null) {
- throw new NullPointerException(
- "No resource bundle was provided to the Alerts.");
- }
- if (plugin == null) {
- throw new NullPointerException(
- "No plugin was provided to the Alerts.");
- }
- _pluginId = plugin.getBundle().getSymbolicName();
- }
-
- /**
- * Returns the text entered by a user in a simple request dialog.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param initialValue -
- * initial value in the text area.
- * @param validator -
- * something that checks for validity on the name.
- * @return null is returned if the user hits cancel, otherwise it is the
- * text they entered.
- */
- public String getInput(String titleKey, String msgKey, String initialValue,
- IInputValidator validator) {
- if (_noAlerts) {
- return null;
- }
-
- InputDialog inDialog = new InputDialog(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey),
- initialValue, validator);
- inDialog.open();
- return inDialog.getValue();
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void error(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0, Object arg1) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param arg2 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0, Object arg1,
- Object arg2) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[3];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param arg2 -
- * arg to place into the resource bundle message.
- * @param arg3 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0, Object arg1,
- Object arg2, Object arg3) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[4];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
- args[3] = arg3;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param shell -
- * the shell for the error dialog
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void error(Shell shell, String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openError(shell, getResourceString(titleKey),
- getResourceString(msgKey));
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void detailError(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- final IStatus fstatus = new Status(IStatus.ERROR, _pluginId,
- IStatus.OK, getResourceString(msgKey), null);
- final String ftitle = getResourceString(titleKey);
-
- Display display = getStandardDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- ErrorDialog.openError(null, ftitle, null, fstatus);
- }
- });
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param tt -
- * exception to place in the details.
- */
- public void detailError(String titleKey, String msgKey, Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- internalDetailError(getResourceString(titleKey),
- getResourceString(msgKey), tt);
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param tt -
- * exception to place in the details.
- */
- public void detailError(String titleKey, String msgKey, Object arg0,
- Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- internalDetailError(getResourceString(titleKey),
- formatter.format(args), tt);
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param tt -
- * exception to place in the details.
- */
- public void detailError(String titleKey, String msgKey, Object arg0,
- Object arg1, Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- internalDetailError(getResourceString(titleKey),
- formatter.format(args), tt);
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param title -
- * the title message
- * @param message -
- * message displayed to the user
- */
- private void internalDetailError(String title, String msg, Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- if (tt instanceof InvocationTargetException) {
- tt = ((InvocationTargetException) tt).getTargetException();
- }
-
- IStatus status = null;
- if (tt instanceof CoreException) {
- status = ((CoreException) tt).getStatus();
-
- if ((status instanceof MultiStatus) == false) {
- // convert to a multistatus to show the exception details.
-
- Throwable th = status.getException();
- if (th == null) {
- th = tt;
- }
-
- status = buildStackTraceStatus(IStatus.ERROR, status
- .getPlugin(), status.getMessage(), th);
- }
- } else {
- status = buildStackTraceStatus(IStatus.ERROR, _pluginId, tt
- .getMessage(), tt);
- }
-
- final String ftitle = title;
- final IStatus fstatus = status;
- final String fmsg = msg;
- Display display = getStandardDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- ErrorDialog.openError(null, ftitle, fmsg, fstatus);
- }
- });
- }
-
- /**
- * Builds a multistatus, so that the stack trace shows up in the alery
- * message for detailed alerts.
- *
- * @param code
- * @param pluginId
- * @param message
- * @param tt
- * @return the result of the operation
- */
- public IStatus buildStackTraceStatus(int code, String pluginId,
- String message, Throwable tt) {
- if (tt == null) {
- return new Status(code, pluginId, IStatus.OK, message, tt);
- }
-
- MultiStatus mstat = new MultiStatus(pluginId, code, message, tt);
-
- StackTraceElement[] trace = tt.getStackTrace();
-
- mstat.add(new Status(code, pluginId, IStatus.OK, tt.toString(), null));
- for (int ii = 0; ii < trace.length; ii++) {
- mstat.add(new Status(code, pluginId, IStatus.OK, trace[ii]
- .toString(), null));
- }
- return mstat;
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param status -
- * the status
- * @param title -
- * the title of the message
- */
- public void detailError(String title, IStatus status) {
- if (_noAlerts) {
- return;
- }
-
- final IStatus fstatus = status;
- final String ftitle = title;
- Display display = getStandardDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- ErrorDialog.openError(null, ftitle, null, fstatus);
- }
- });
- }
-
- /**
- * Displays an information message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void info(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openInformation(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an information message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- */
- public void info(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openInformation(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an confirmation message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @return true if the user presses the OK button, false otherwise
- */
- public boolean confirm(String titleKey, String msgKey) {
- if (_noAlerts) {
- return true;
- }
-
- return MessageDialog.openConfirm(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an confirmation message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @return true if the user presses the OK button, false otherwise
- */
- public boolean confirm(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return true;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- return MessageDialog.openConfirm(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an question message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @return true if the user presses the "yes" button, false otherwise
- */
- public boolean question(String titleKey, String msgKey) {
- if (_noAlerts) {
- return true;
- }
-
- return MessageDialog.openQuestion(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an question message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @return true if the user presses the "yes" button, false otherwise
- */
- public boolean question(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return true;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- return MessageDialog.openQuestion(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an warning message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void warning(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openWarning(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an warning message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- */
- public void warning(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openWarning(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * 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 Display getStandardDisplay() {
- Display display = Display.getCurrent();
- if (display == null) {
- display = Display.getDefault();
- }
- return display;
- }
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- public String getResourceString(String key) {
- if (key == null) {
- return null;
- }
-
- try {
- return _rb.getString(key);
- } catch (MissingResourceException ee) {
- return key;
- }
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @throws CoreException
- */
- public void throwCoreException(String msgKey) throws CoreException {
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- getResourceString(msgKey), null);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(Throwable ee) throws CoreException {
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK, ee
- .getMessage(), ee);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Throwable ee)
- throws CoreException {
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- getResourceString(msgKey), ee);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0)
- throws CoreException {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), null);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0, Throwable ee)
- throws CoreException {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), ee);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0, Object arg1)
- throws CoreException {
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), null);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0, Object arg1,
- Throwable ee) throws CoreException {
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), ee);
- throw new CoreException(status);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java
deleted file mode 100644
index 95b02c427..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.LocationAdapter;
-import org.eclipse.swt.browser.LocationEvent;
-import org.eclipse.swt.browser.OpenWindowListener;
-import org.eclipse.swt.browser.StatusTextEvent;
-import org.eclipse.swt.browser.StatusTextListener;
-import org.eclipse.swt.browser.WindowEvent;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * Brings up a browser into a separate window.
- *
- * @author mengbo
- */
-public class BrowserWindow extends ApplicationWindow {
- /**
- * Command to send to the browser.
- */
- public static final int BROWSER_CMD_BACK = 1;
-
- public static final int BROWSER_CMD_FORWARD = 2;
-
- public static final int BROWSER_CMD_STOP = 3;
-
- public static final int BROWSER_CMD_REFRESH = 4;
-
- public static final int BROWSER_CMD_RELOAD = 5;
-
- protected boolean _bIncludeToolbar;
-
- protected boolean _bPopups;
-
- protected String _title;
-
- protected ScrolledComposite _scomp;
-
- protected Composite _browserComposite;
-
- protected Browser _browser;
-
- protected String _startLocation;
-
- protected String _startContent;
-
- protected Point _size = new Point(600, 600);
-
- // these items are browser context sensitive.
- protected ToolItem _backItem;
-
- protected ToolItem _forwardItem;
-
- /**
- * @param parentShell
- * owner of this window.
- */
- public BrowserWindow(Shell parentShell) {
- this(parentShell, false, null, false);
- }
-
- /**
- * @param parentShell
- * owner of this window.
- * @param bPopups
- * allow popup windows?
- * @param title
- * Tittle on window.
- */
- public BrowserWindow(Shell parentShell, boolean bPopups, String title) {
- this(parentShell, bPopups, title, false);
- }
-
- /**
- * @param parentShell
- * owner of this window.
- * @param bPopups
- * allow popup windows?
- * @param title
- * Tittle on window.
- * @param bModal
- * pretend to a be a dialog?
- */
- public BrowserWindow(Shell parentShell, boolean bPopups, String title,
- boolean bModal) {
- super(parentShell);
- addStatusLine();
- _bPopups = bPopups;
- _title = title;
- includeToolbar(true);
-
- if (bModal && (parentShell != null)) {
- // APPLICATION_MODAL, MODELESS, PRIMARY_MODAL, SYSTEM_MODAL
- setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL);
- setBlockOnOpen(true);
- }
- }
-
- /**
- * Default is true, set whether to include the toolbar at the top. This must
- * be called before the window is opened.
- *
- * @param bIncludeToolbar
- */
- public void includeToolbar(boolean bIncludeToolbar) {
- _bIncludeToolbar = bIncludeToolbar;
- }
-
- public void setTitle(String title) {
- if ((title != null) && (super.getShell() != null)) {
- super.getShell().setText(title);
- }
- }
-
- public void setStartLocation(String startLocation) {
- _startLocation = startLocation;
- }
-
- public void setStartContent(String startContent) {
- _startContent = startContent;
- }
-
- public Browser getBrowser() {
- return _browser;
- }
-
- protected Control createContents(Composite parent) {
- // Create the scroll composite as the one inside the parent.
- _scomp = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
-
- // Create the composite that goes inside the scroller. We will use this
- // for
- // everything else from here.
- Composite innerComposite = SWTUtils.createComposite(_scomp, 1, 10, -1);
- _scomp.setContent(innerComposite);
- ControlListener listener = new ControlAdapter() {
- // this will handle resizing the browser when the window is resized.
- public void controlResized(ControlEvent e) {
- Point pt = _scomp.getParent().getSize();
- Rectangle rect = _browserComposite.getBounds();
-
- pt.x -= rect.x;
- pt.y -= rect.y;
-
- // spacing offsets in the composites.
- pt.x -= 10;
- pt.y -= 60; // need status bar at bottom...30 more than normal.
-
- // do the sanity check here since it prevents further checks.
- if ((pt.x <= 0) || (pt.y <= 0)) {
- return;
- }
-
- Rectangle innerRect = _scomp.getContent().getBounds();
- Rectangle outerRect = _scomp.getBounds();
-
- // substract if the scroll bars are visible.
- if (innerRect.width > outerRect.width) {
- pt.y -= _scomp.getHorizontalBar().getSize().y;
- }
- if (innerRect.height > outerRect.height) {
- pt.x -= _scomp.getVerticalBar().getSize().x;
- }
-
- _browserComposite.setSize(pt);
- _browserComposite.getParent().layout(true);
- }
- };
- _scomp.addControlListener(listener);
-
- if (_bIncludeToolbar) {
- // ////////////////////////////////////////
- // toobar
- // ////////////////////////////////////////
- ToolBar tb = new ToolBar(innerComposite, SWT.HORIZONTAL | SWT.FLAT);
- fillToolbar(tb);
- }
-
- // ////////////////////////////////////////
- // browser
- // ////////////////////////////////////////
- _browserComposite = new Composite(innerComposite, SWT.NULL);
- _browserComposite.setLayout(new FillLayout());
-
- _browser = new Browser(_browserComposite, SWT.NULL);
-
- if (_startLocation != null) {
- _browser.setUrl(_startLocation);
- } else if (_startContent != null) {
- _browser.setText(_startContent);
- } else {
- _browser.setText("<b>Loading...</b>");
- }
-
- // send the browser status messages to eclipse.
- _browser.addStatusTextListener(new StatusTextListener() {
- public void changed(StatusTextEvent event) {
- setStatus(event.text);
- }
- });
-
- if (_bIncludeToolbar) {
- // check for change in location so we can enable the back/forward
- // buttons.
- _browser.addLocationListener(new LocationAdapter() {
- public void changed(LocationEvent event) {
- // check if there is something in the forward or back queue.
- _backItem.setEnabled(_browser.isBackEnabled());
- _forwardItem.setEnabled(_browser.isForwardEnabled());
- }
- });
- }
-
- // check is we need to open a new window.
- _browser.addOpenWindowListener(new OpenWindowListener() {
- public void open(WindowEvent event) {
- if (_bPopups) {
- BrowserWindow window = new BrowserWindow(getShell());
- window.open();
- event.browser = window.getBrowser();
- } else {
- event.browser = getBrowser();
- }
- }
- });
-
- setTitle(_title);
- SWTUtils.computeScrollArea(_scomp, innerComposite);
- return _scomp;
- }
-
- /**
- * Fill the toolbar for this window. This method can be overwritten to place
- * other toolbar controls in the bar.
- *
- * @param tb
- */
- protected void fillToolbar(ToolBar tb) {
- // Back browser
- _backItem = new ToolItem(tb, SWT.PUSH);
- _backItem.setImage(JSFUICommonPlugin.getDefault()
- .getImage("back_nav_16.gif"));
- _backItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.back.tooltip"));
- SelectionListener backSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_BACK);
- }
- };
- _backItem.addSelectionListener(backSelectionListener);
-
- // Forward Browser
- _forwardItem = new ToolItem(tb, SWT.PUSH);
- _forwardItem.setImage(JSFUICommonPlugin.getDefault().getImage(
- "forward_nav_16.gif"));
- _forwardItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.forward.tooltip"));
- SelectionListener forwardSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_FORWARD);
- }
- };
- _forwardItem.addSelectionListener(forwardSelectionListener);
-
- // Stop Browser
- ToolItem stopItem = new ToolItem(tb, SWT.PUSH);
- stopItem
- .setImage(JSFUICommonPlugin.getDefault().getImage("stop_nav_16.gif"));
- stopItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.stop.tooltip"));
- SelectionListener stopSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_STOP);
- }
- };
- stopItem.addSelectionListener(stopSelectionListener);
-
- // Refresh Browser
- ToolItem refreshItem = new ToolItem(tb, SWT.PUSH);
- refreshItem.setImage(JSFUICommonPlugin.getDefault().getImage(
- "refresh_nav_16.gif"));
- refreshItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.refresh.tooltip"));
- SelectionListener refreshServiceSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_REFRESH);
- }
- };
- refreshItem.addSelectionListener(refreshServiceSelectionListener);
-
- if ((_startLocation != null) || (_startContent != null)) {
- // Reload Browser.
- ToolItem reloadItem = new ToolItem(tb, SWT.PUSH);
- reloadItem.setImage(JSFUICommonPlugin.getDefault().getImage(
- "reload_nav_16.gif"));
- reloadItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.reload.tooltip"));
- SelectionListener reloadSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_RELOAD);
- }
- };
- reloadItem.addSelectionListener(reloadSelectionListener);
- }
- }
-
- /**
- * send the browser widget a command as defined by the cmd constant defines.
- *
- * @return true if the command was successful.
- */
- public boolean browserCmd(int cmd) {
- switch (cmd) {
- case BROWSER_CMD_BACK:
- return _browser.back();
- case BROWSER_CMD_FORWARD:
- return _browser.forward();
- case BROWSER_CMD_STOP:
- _browser.stop();
- return true;
- case BROWSER_CMD_REFRESH:
- _browser.refresh();
- return true;
- case BROWSER_CMD_RELOAD:
- if (_startLocation != null) {
- _browser.setUrl(_startLocation);
- } else if (_startContent != null) {
- _browser.setText(_startContent);
- }
- return true;
-
- }
- return false;
- }
-
- public void setStartSize(Point pp) {
- _size = pp;
- }
-
- public void setStartSize(int x, int y) {
- _size = new Point(x, y);
- }
-
- protected Point getInitialSize() {
- return _size;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java
deleted file mode 100644
index 83777fcb0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.events.ExpansionAdapter;
-import org.eclipse.ui.forms.events.ExpansionEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * Creates a class to be used to build a control for a collapseable area inside
- * a scrollable composite. This will take care of scrollbar resize.
- *
- * Example use:
- *
- * CollapsableSection cs = new CollapsableSection(toolkit, scomp, "General",
- * true) { public void setCollapsableContent(Composite composite) { // place
- * your content on this composite.... } }); cs.createControl(composite,
- * horizontalSpan);
- *
- * @author mengbo
- *
- */
-public abstract class CollapsableSection {
- // internal fields needed for doing the section and computing the scrollbar
- // on a collapse.
- protected FormToolkit _toolkit;
-
- protected Section _section;
-
- protected ScrolledComposite _scomp;
-
- protected String _title;
-
- protected int _expansionStyle;
-
- /**
- * Creates a class to be used to build the control for a collapseable area.
- *
- * @param toolkit
- *
- * @param scomp
- * the scrollable composite used inside the container. This is
- * used to force resizing of the bars on dinking the control.
- * @param title
- * the string to place next to the collapsable icon.
- * @param bCollapsed
- * should this area start collapsed?
- */
- public CollapsableSection(FormToolkit toolkit, ScrolledComposite scomp,
- String title, boolean bCollapsed) {
- _toolkit = toolkit;
- _scomp = scomp;
- _title = title;
- _expansionStyle = ExpandableComposite.TWISTIE
- | ExpandableComposite.FOCUS_TITLE;
- if (bCollapsed) {
- _expansionStyle |= ExpandableComposite.COMPACT;
- } else {
- _expansionStyle |= ExpandableComposite.EXPANDED;
- }
- }
-
- /**
- * Build the GUI parts of the Collapsable area into the given composite.
- * NOTE: you must set the layout on this composite before adding swt
- * widgets.
- *
- * @param composite
- */
- abstract public void setCollapsableContent(Composite composite);
-
- /**
- * A convient way to build the widget into a control and place it on the
- * page. NOTE: this method will build the Section and call
- * setCollapsableContent with a composite to fill in the inner area.
- *
- * @param parent
- * @param horizontalSpan
- * how many columns should this control span.
- * @return Control that was added to the composite.
- */
- public Control createControl(Composite parent, int horizontalSpan) {
- _section = _toolkit.createSection(parent, _expansionStyle);
- _section.clientVerticalSpacing = 5; // space between the dink and the
- // controls in when opened.
- // _section.marginHeight = 5; // indents the entire section.
- // _section.marginWidth = 5; // indents the entire section.
- _section.setText(_title);
- _toolkit.createCompositeSeparator(_section);
- _section.addExpansionListener(new ExpansionAdapter() {
- public void expansionStateChanged(ExpansionEvent event) {
- SWTUtils.computeScrollArea(_scomp, (Composite) _scomp
- .getContent());
- }
- });
-
- Composite content = new Composite(_section, SWT.NULL);
- setCollapsableContent(content);
-
- _section.setClient(content);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = horizontalSpan;
- _section.setLayoutData(gd);
-
- return _section;
- }
-
- /**
- * Programmatically changes expanded state.
- *
- * @param expanded
- * the new expanded state
- */
- public void setExpanded(boolean expanded) {
- if (_section != null) {
- _section.setExpanded(expanded);
-
- // NOTE: internal calling of expanding doesn't fire
- // the event to resize. We do it here.
- SWTUtils.computeScrollArea(_scomp, (Composite) _scomp.getContent());
- }
- }
-
- /**
- * Return the internal Section control for more advanced things.
- *
- * @return Section
- */
- public Section getSection() {
- return _section;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java
deleted file mode 100644
index 0075afbe7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-import java.util.Properties;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.utils.FavoriteConfigurations;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Builds a favorites with the given name in the plugins resources. This build a
- * generic looking favorites section.
- *
- * @author mengbo
- */
-public abstract class FavoriteSection {
- private FavoriteConfigurations _favorites;
-
- private Combo _favoriteCombo;
-
- public FavoriteSection(AbstractUIPlugin plugin, String favoriteName) {
- _favorites = new FavoriteConfigurations(plugin, favoriteName);
- }
-
- public Combo createFavoriteGroup(Composite parent, int horizontalSpan,
- int comboMinWidth) {
- Group favGroup = SWTUtils.createGroup(parent, JSFUICommonPlugin
- .getResourceString("favorites.group.label"), 4, horizontalSpan,
- GridData.BEGINNING | GridData.CENTER);
-
- // Add favorite text field
- SWTUtils.createLabel(favGroup, JSFUICommonPlugin
- .getResourceString("favorites.label"), 1);
- _favoriteCombo = SWTUtils.createCombo(favGroup, _favorites
- .getFavoritesList(), 1, comboMinWidth, true);
- _favoriteCombo.setToolTipText(JSFUICommonPlugin
- .getResourceString("favorites.tooltip"));
- _favoriteCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- String favName = _favoriteCombo.getText().trim();
- if (favName.length() > 0) {
- Properties favProp = _favorites.getFavorite(_favoriteCombo
- .getText().trim());
- if (favProp != null) {
- setFavorites(favProp);
- }
- }
- }
- });
-
- // Add Save button
- Button saveButton = SWTUtils.createPushButton(favGroup, JSFUICommonPlugin
- .getResourceString("button.save"));
- saveButton.setToolTipText(JSFUICommonPlugin
- .getResourceString("favorites.save.tooltip"));
- saveButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- String favName = _favoriteCombo.getText().trim();
- if (favName.length() == 0) {
- favName = JSFUICommonPlugin
- .getResourceString("favorites.default");
- }
- Properties favProp = new Properties();
- saveFavorites(favProp);
-
- _favorites.addFavorite(favName, favProp);
- _favorites.saveFavorites();
-
- _favoriteCombo.removeAll();
- String[] names = _favorites.getFavoritesList();
-
- _favoriteCombo.setItems(names);
- _favoriteCombo.setText(favName);
- }
- });
-
- // Add Remove button
- Button removeButton = SWTUtils.createPushButton(favGroup, JSFUICommonPlugin
- .getResourceString("button.remove"));
- removeButton.setToolTipText(JSFUICommonPlugin
- .getResourceString("favorites.remove.tooltip"));
- removeButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- String favName = _favoriteCombo.getText().trim();
- if (favName.length() > 0) {
- _favorites.removeFavorite(favName);
- _favorites.saveFavorites();
-
- removeFavorites();
-
- _favoriteCombo.removeAll();
- String[] names = _favorites.getFavoritesList();
- _favoriteCombo.setItems(names);
- }
- }
- });
-
- return _favoriteCombo;
- }
-
- /**
- * This method will be called when a new favorite is set. This allows the
- * caller to set their values from the properties supplied.
- *
- * @param prop
- */
- public abstract void setFavorites(Properties prop);
-
- /**
- * This method will be called when a new favorite is saved. This allows the
- * caller to save their values into the properties supplied.
- *
- * @param prop
- */
- public abstract void saveFavorites(Properties prop);
-
- /**
- * This method will be called when the active favorite is removed. It allows
- * for clearing fields.
- */
- public void removeFavorites() {
- // do nothing.
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java
deleted file mode 100644
index b2a6a3e4b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A general purpose class for displying an image in a composite. There is no
- * eclipse tool for doing this other than CLabl which is bulkly.
- *
- * This was original written by Karl Reti.
- *
- * @author mengbo
- */
-public class ImageContainer extends Composite {
- private Image _image = null;
-
- private boolean _bCleanupImage;
-
- /**
- * @param parent
- */
- public ImageContainer(Composite parent) {
- super(parent, SWT.NONE);// SWT.NO_BACKGROUND );//|
- // SWT.NO_REDRAW_RESIZE);
- setBackground(ColorConstants.white);
- // paint the image
- addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- if (_image != null) {
- e.gc.drawImage(_image, 0, 0);
- }
- }
-
- });
-
- addControlListener(new ControlAdapter() {
- public void controlResized(ControlEvent e) {
- setSize(_image.getBounds().width, _image.getBounds().height);
- }
- });
-
- // tidy up
- addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- if (_bCleanupImage && _image != null && !_image.isDisposed()) {
- _image.dispose();
- }
- }
- });
- }
-
- /**
- * @return Returns the image.
- */
- public Image getImage() {
- return _image;
- }
-
- /**
- * @return should the image be disposed of on cleanup. Set false if the
- * image is cached.
- */
- public boolean isCleanupImage() {
- return _bCleanupImage;
- }
-
- /**
- * @param image
- * The image to set.
- */
- public void setImage(Image image) {
- setImage(image, false);
- }
-
- /**
- * @param image
- * The image to set.
- */
- public void setImage(Image image, boolean bCleanupImage) {
- _image = image;
- _bCleanupImage = bCleanupImage;
- setSize(image.getBounds().width, image.getBounds().height);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java
deleted file mode 100644
index 51419a7ac..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java
+++ /dev/null
@@ -1,328 +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.common.ui.internal.guiutils;
-
-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.core.runtime.Plugin;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-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.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Provides a standard looking introduction section for a intro page for the
- * editors. This was taken and is suppose to look like the standard Sybase
- * workspace service editors intro page.
- *
- * this was original written by Collinsc
- *
- * @author collinsc,jchoi
- */
-public class IntroductionSection extends SectionPart {
- private static Logger _log = JSFUICommonPlugin
- .getLogger(IntroductionSection.class);
-
- private String _editorId;
-
- private FormToolkit _toolkit;
-
- // private ImageHyperlink _helpImage;
- private Composite _textClient;
-
- private String _helpContextId;
-
- private String _helpTooltip;
-
- /**
- * Basic constructor - no help with this one.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- */
- public IntroductionSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit) {
- this(editorId, managedForm, toolkit, null, null);
- }
-
- /**
- * Constructor with help option.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- * @param contextId
- * @param helpTooltip
- */
- public IntroductionSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit, final String contextId, String helpTooltip) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | Section.DESCRIPTION);
- super.initialize(managedForm);
- this._editorId = editorId;
- this._toolkit = toolkit;
- this._helpContextId = contextId;
- this._helpTooltip = helpTooltip;
-
- this._textClient = this._toolkit.createComposite(getSection(), SWT.NONE);
- this._textClient.setSize(32, 16);
-
- RowLayout rowLayout = new RowLayout();
- rowLayout.wrap = false;
- rowLayout.pack = false;
- rowLayout.justify = true;
- rowLayout.type = SWT.HORIZONTAL;
- rowLayout.marginLeft = 0;
- rowLayout.marginTop = 0;
- rowLayout.marginRight = 0;
- rowLayout.marginBottom = 0;
- rowLayout.spacing = 0;
- this._textClient.setLayout(rowLayout);
-
- this._toolkit.adapt(this._textClient, true, true);
- getSection().setTextClient(this._textClient);
-
- if (this._helpContextId != null) {
- // setup the help image.
- ImageHyperlink helpImage = new ImageHyperlink(this._textClient,
- SWT.NONE);
- this._toolkit.adapt(helpImage, true, true);
- helpImage.setImage(JSFUICommonPlugin.getDefault().getImage("help.gif"));
- if (this._helpTooltip != null) {
- helpImage.setToolTipText(this._helpTooltip);
- }
- helpImage.setBackground(getSection()
- .getTitleBarGradientBackground());
- 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) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(topics[0]
- .getHref());
- } else {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(_helpContextId);
- }
- }
- }
- });
- }
-
- Composite client = this._toolkit.createComposite(getSection());
- createClient(client, this._toolkit);
- getSection().setClient(client);
- }
-
- private Composite createClient(Composite container, FormToolkit factory) {
- TableWrapLayout layout = new TableWrapLayout();
- layout.numColumns = 2;
- layout.makeColumnsEqualWidth = false;
- layout.horizontalSpacing = 20;
- layout.verticalSpacing = 20;
- container.setLayout(layout);
-
- IConfigurationElement element = getExtensions();
-
- if (element != null) {
- setPageDetails(element);
-
- IConfigurationElement[] children = element.getChildren();
- for (int ii = 0; ii < children.length; ii++) {
- processItems(container, factory, children[ii]);
- }
- } else {
- setText("No Introduction");
-
- setDescription("No Introduction page configuration found in the plugin.xml");
- }
-
- factory.paintBordersFor(container);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(container, _helpContextId);
- return container;
- }
-
- /**
- * set the page details from the extensionpoint
- *
- * @param element
- */
- private void setPageDetails(IConfigurationElement element) {
- setText(element.getAttribute("name")); //$NON-NLS-1$
- setDescription(element.getAttribute("description")); //$NON-NLS-1$
- }
-
- /**
- * add the extension elements to the page
- *
- * @param parent
- * @param toolkit_
- * @param element
- */
- private void processItems(Composite parent, FormToolkit toolkit_,
- IConfigurationElement element) {
- String hyperlink = element.getAttribute("hyperlink"); //$NON-NLS-1$
- String iconPath = element.getAttribute("icon"); //$NON-NLS-1$
- String text = element.getAttribute("text"); //$NON-NLS-1$
- String heading = element.getAttribute("heading"); //$NON-NLS-1$
- String action = element.getAttribute("hyperlinkaction"); //$NON-NLS-1$
- //String actionparameters = element.getAttribute("actionparameters"); //$NON-NLS-1$
-
- if (iconPath != null && iconPath.length() > 0) {
- // add an icon to the page
-
- if (iconPath != null) {
- String iconName;
- if (iconPath.indexOf(IPath.SEPARATOR) != -1) {
- iconName = new Path(iconPath).lastSegment();
- } else {
- iconName = iconPath;
- }
-
- Plugin plugin = Platform.getPlugin(element
- .getDeclaringExtension().getContributor().getName());
- if (plugin instanceof AbstractUIPlugin) {
- ImageRegistry imageRegistry = ((AbstractUIPlugin) plugin)
- .getImageRegistry();
- Image image = imageRegistry.get(iconName);
- if (image == null) {
- ImageDescriptor imageDescriptor = AbstractUIPlugin
- .imageDescriptorFromPlugin(
- element.getDeclaringExtension()
- .getContributor().getName(), iconPath);
- imageRegistry.put(iconName, imageDescriptor);
- image = imageRegistry.get(iconName);
- }
-
- ImageContainer img = new ImageContainer(parent);
- img.setImage(image);
- TableWrapData td = new TableWrapData();
- td.rowspan = 2;
- img.setLayoutData(td);
- }
- }
-
-
- }
-
- if (heading != null && heading.length() > 0) {
- // add a header
- Label lbl = toolkit_.createLabel(parent, heading);
- lbl.setFont(JFaceResources.getHeaderFont());
- }
-
- if (hyperlink != null && hyperlink.length() > 0) {
- Hyperlink hypr = toolkit_.createHyperlink(parent, hyperlink,
- SWT.NONE);
- if (action != null && action.length() > 0) {
- try {
- final IAction thisAction = (IAction) element
- .createExecutableExtension("hyperlinkaction"); //$NON-NLS-1$
- hypr.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- thisAction.run();
- }
- });
- } catch (Exception ee) {
- // log.IntroductionSection.action.error=Failed to launch the
- // link {0}.
- _log.error("log.IntroductionSection.action.error",
- hyperlink, ee);
- JSFUICommonPlugin.getAlerts().detailError(hyperlink,
- "log.IntroductionSection.action.error", hyperlink,
- ee);
- }
- }
- }
-
- if (text != null && text.length() > 0) {
- FormText form = toolkit_.createFormText(parent, false);
- form.setText(text, false, false);
- }
- }
-
- /**
- * Get the extension elements for the Introduction pages
- */
- private IConfigurationElement getExtensions() {
- // find all service editor page extensions
- IConfigurationElement element = null;
-
- // find all service editor parameter dialog extensions
- IConfigurationElement[] elements = Platform
- .getExtensionRegistry()
- .getConfigurationElementsFor(
- "org.eclipse.jst.jsf.common.ui.introductionPage");
- if (elements.length > 0) {
- for (int ii = 0; ii < elements.length; ii++) {
- // get extensions for this dialog
- // String extPluginId =
- // elements[ii].getDeclaringExtension().getNamespace();
- String editorId1 = elements[ii].getDeclaringExtension()
- .getSimpleIdentifier();
-
- // see if we have any contributuins of dialogs
- if (this._editorId.equals(editorId1)) {
- element = elements[ii];
- break;
- }
- }
- }
- return element;
- }
-
- private void setText(String text) {
- getSection().setText(text);
- }
-
- private void setDescription(String text) {
- getSection().setDescription(text);
- }
-
- /**
- * Set this section's layout data
- * @param layoutData
- */
- public void setLayoutData(Object layoutData) {
- getSection().setLayoutData(layoutData);
- }
-} \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java
deleted file mode 100644
index 7fd9e54f0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java
+++ /dev/null
@@ -1,335 +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.common.ui.internal.guiutils;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.editor.FormEditor;
-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.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-
-
-/**
- * @author jchoi
- * @version
- */
-public class OverviewSection extends SectionPart {
-
- private static Logger log = JSFUICommonPlugin.getLogger(OverviewSection.class);
-
- private String editorId;
-
- private FormToolkit toolkit;
-
- private ImageHyperlink helpImage;
-
- private Composite textClient;
-
- private String helpContextId;
-
- private String helpTooltip;
-
- protected FormEditor editor;
-
- /**
- * @param editorId
- * @param managedForm
- * @param toolkit
- */
- public OverviewSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit) {
- this(editorId, managedForm, toolkit, null, null);
-
- }
-
- /**
- * Constructor with help option.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public OverviewSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | Section.DESCRIPTION);
- super.initialize(managedForm);
- this.editorId = editorId;
- this.toolkit = toolkit;
- this.helpContextId = helpContextId;
- this.helpTooltip = helpTooltip;
-
- this.textClient = this.toolkit.createComposite(getSection(), SWT.NONE);
- this.textClient.setSize(32, 16);
-
- init();
-
- Composite client = this.toolkit.createComposite(getSection());
- createClient(client, this.toolkit);
- getSection().setClient(client);
- }
-
- /**
- * @param editor
- * @param managedForm
- * @param toolkit
- * @param style
- */
- public OverviewSection(FormEditor editor, IManagedForm managedForm,
- FormToolkit toolkit, int style) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | style);
- super.initialize(managedForm);
- this.editor = editor;
- this.toolkit = toolkit;
-
- this.textClient = this.toolkit.createComposite(getSection(), SWT.NONE);
- this.textClient.setSize(32, 16);
-
- init();
- }
-
- public OverviewSection(FormEditor editor, IManagedForm managedForm,
- FormToolkit toolkit, int style, String helpContextId,
- String helpTooltip) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | style);
- super.initialize(managedForm);
- this.editor = editor;
- this.toolkit = toolkit;
-
- this.textClient = toolkit.createComposite(getSection(), SWT.NONE);
- this.textClient.setSize(32, 16);
- this.helpContextId = helpContextId;
- this.helpTooltip = helpTooltip;
- init();
- }
-
- public void initialize() {
- Composite client = toolkit.createComposite(getSection());
- createClient(client, toolkit);
- getSection().setClient(client);
- }
-
- private void init() {
- RowLayout rowLayout = new RowLayout();
- rowLayout.wrap = false;
- rowLayout.pack = false;
- rowLayout.justify = true;
- rowLayout.type = SWT.HORIZONTAL;
- rowLayout.marginLeft = 0;
- rowLayout.marginTop = 0;
- rowLayout.marginRight = 0;
- rowLayout.marginBottom = 0;
- rowLayout.spacing = 0;
- textClient.setLayout(rowLayout);
-
- helpImage = new ImageHyperlink(textClient, SWT.NONE);
- toolkit.adapt(helpImage, true, true);
- toolkit.adapt(textClient, true, true);
- helpImage.setImage(JSFUICommonPlugin.getDefault().getImage("help.gif")); //$NON-NLS-1$
- getSection().setTextClient(textClient);
- if (helpTooltip != null) {
- helpImage.setToolTipText(helpTooltip);
- }
- helpImage.setBackground(getSection().getTitleBarGradientBackground());
- 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) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(topics[0].getHref());
- } else {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(helpContextId);
- }
- }
- }
- });
-
- /*
- * Composite client = _toolkit.createComposite(getSection());
- * createClient(client, _toolkit); getSection().setClient(client);
- */
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.update.ui.forms.internal.FormSection#createClient(org.eclipse.swt.widgets.Composite,
- * org.eclipse.update.ui.forms.internal.FormWidgetFactory)
- */
- public Composite createClient(Composite container, FormToolkit factory) {
- return null;
- }
-
- protected Composite createClientContainer(Composite parent, int span,
- FormToolkit toolkit_) {
- Composite container = toolkit_.createComposite(parent);
- GridLayout layout = new GridLayout();
- layout.marginWidth = layout.marginHeight = 2;
- layout.numColumns = span;
- container.setLayout(layout);
- return container;
- }
-
- /**
- * set the page details from the extensionpoint
- *
- * @param element
- */
- protected void setPageDetails(IConfigurationElement element) {
- setText(element.getAttribute("name")); //$NON-NLS-1$
- setDescription(element.getAttribute("description")); //$NON-NLS-1$
- }
-
- /**
- * add the extension elements to the page
- *
- * @param parent
- * @param toolkit_
- * @param element
- */
- public void processItems(Composite parent, FormToolkit toolkit_,
- IConfigurationElement element) {
- String hyperlink = element.getAttribute("hyperlink"); //$NON-NLS-1$
- String text = element.getAttribute("text"); //$NON-NLS-1$
- String action = element.getAttribute("hyperlinkaction"); //$NON-NLS-1$
- //String actionparameters = element.getAttribute("actionparameters"); //$NON-NLS-1$
-
- if (hyperlink != null && hyperlink.length() > 0) {
- Hyperlink hypr = toolkit_.createHyperlink(parent, hyperlink,
- SWT.NONE);
- if (action != null && action.length() > 0) {
- try {
- final IAction thisAction = (IAction) element
- .createExecutableExtension("hyperlinkaction"); //$NON-NLS-1$
- hypr.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- thisAction.run();
- }
- });
- } catch (Exception ee) {
- // log.IntroductionSection.action.error=Failed to launch the
- // link {0}.
- log
- .error("log.OverviewSection.action.error",
- hyperlink, ee);
- JSFUICommonPlugin.getAlerts().detailError(hyperlink,
- "log.OverviewSection.action.error", hyperlink, ee);
- }
- }
- }
-
- if (text != null && text.length() > 0) {
- FormText form = toolkit_.createFormText(parent, false);
- form.setText(text, false, false);
- }
- }
-
- /**
- * Get the extension elements for the Introduction pages
- */
- public IConfigurationElement getExtensions(String extensionPoint) {
- // find all service editor page extensions
- IConfigurationElement element = null;
-
- // find all service editor parameter dialog extensions
- IConfigurationElement[] elements = Platform.getExtensionRegistry()
- .getConfigurationElementsFor(extensionPoint);
- if (elements.length > 0) {
- for (int ii = 0; ii < elements.length; ii++) {
- // get extensions for this dialog
- // String extPluginId =
- // elements[ii].getDeclaringExtension().getNamespace();
- String anEditorId = elements[ii].getDeclaringExtension()
- .getSimpleIdentifier();
-
- // see if we have any contributuins of dialogs
- if (this.editorId.equals(anEditorId)) {
- element = elements[ii];
- break;
- }
- }
- }
- return element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.service.framework.forms.ISESection#setEditor()
- */
- public void setEditor(FormEditor editor) {
- this.editor = editor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.service.framework.forms.ISESection#getEditor()
- */
- public FormEditor getEditor() {
- return editor;
- }
-
- public void setText(String text) {
- getSection().setText(text);
- }
-
- public void setDescription(String text) {
- getSection().setDescription(text);
-
- }
-
- public void setLayoutData(Object layoutData) {
- getSection().setLayoutData(layoutData);
- }
-
- public void setExpanded(boolean expanded) {
- getSection().setExpanded(expanded);
- }
-
- /**
- * @return Returns the _helpImage.
- */
- public ImageHyperlink getHelpImage() {
- return helpImage;
- }
-
- public void setEditorID(String id) {
- editorId = id;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java
deleted file mode 100644
index b955c9775..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java
+++ /dev/null
@@ -1,1084 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.TableTree;
-import org.eclipse.swt.custom.TableTreeEditor;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-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.Combo;
-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.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This utility class provides convenience methods in creating controls on
- * preference pages.
- *
- * @author mengbo
- */
-public class SWTUtils {
- // Defaults of controls
- public static final int DEFAULT_BUTTON_WIDTH = 70;
-
- public static final int DEFAULT_COMBO_WIDTH = 100;
-
- public static final int DEFAULT_TEXTBOX_WIDTH = 100;
-
- public static final int DEFAULT_RADIO_FILL = GridData.HORIZONTAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_CENTER;
-
- /**
- * Creates a new checkbox and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the checkbox
- * @return the new checkbox
- */
- public static Button createCheckBox(Composite parent) {
- return createCheckBox(parent, null, 1, 0);
- }
-
- /**
- * Creates a new checkbox and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the checkbox
- * @param label
- * the string to set into the checkbox
- * @param numColumns
- * the number of columns the new checkbox is to occupy
- * @return the new checkbox
- */
- public static Button createCheckBox(Composite parent, String label,
- int numColumns) {
- return createCheckBox(parent, label, numColumns, 0);
- }
-
- /**
- * Creates a new checkbox and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the checkbox
- * @param label
- * the string to set into the checkbox
- * @param numColumns
- * the number of columns the new checkbox is to occupy
- * @param indent
- * the number of pixels to indent from the left
- * @return the new checkbox
- */
- public static Button createCheckBox(Composite parent, String label,
- int numColumns, int indent) {
- Button button = new Button(parent, SWT.CHECK | SWT.LEFT);
- if (label == null) {
- button.setAlignment(SWT.CENTER);
- }
- GridData data = new GridData(GridData.FILL);
- data.horizontalSpan = numColumns;
- data.horizontalIndent = indent;
- button.setLayoutData(data);
- if (label != null) {
- button.setText(label);
- }
- return button;
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param items
- * the items in the combo
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String[] items,
- int numColumns) {
- return createCombo(parent, items, numColumns, DEFAULT_COMBO_WIDTH);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param tokenString
- * a tokenized string that will be split into the fields.
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String tokenString,
- int numColumns) {
- return createCombo(parent, getTokenNames(tokenString), numColumns,
- DEFAULT_COMBO_WIDTH);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param tokenString
- * a tokenized string that will be split into the fields.
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String tokenString,
- int numColumns, int minWidth) {
- return createCombo(parent, getTokenNames(tokenString), numColumns,
- minWidth);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param items
- * the items in the combo
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String[] items,
- int numColumns, int minWidth) {
- return createCombo(parent, items, numColumns, minWidth, false);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param tokenString
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @param editable
- * whether the items in the combo is editable
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String tokenString,
- int numColumns, int minWidth, boolean editable) {
- return createCombo(parent, getTokenNames(tokenString), numColumns,
- minWidth, editable);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param items
- * the items in the combo
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @param editable
- * whether the items in the combo is editable
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String[] items,
- int numColumns, int minWidth, boolean editable) {
- Combo combo;
- GridData data;
- if (editable) {
- combo = new Combo(parent, SWT.DROP_DOWN);
- data = new GridData(GridData.FILL_HORIZONTAL);
- } else {
- combo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
- data = new GridData(GridData.FILL);
- }
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- combo.setLayoutData(data);
- combo.setItems(items);
- return combo;
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns) {
- return createComposite(parent, numColumns, -1, -1,
- GridData.FILL_HORIZONTAL, -1, -1, -1);
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @param verticalSpacing
- * the spacing between rows.
- * @param horizontalSpan
- * the span for this new composite over the original composite.
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns,
- int verticalSpacing, int horizontalSpan) {
- return createComposite(parent, numColumns, verticalSpacing,
- horizontalSpan, GridData.FILL_HORIZONTAL, -1, -1, -1);
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @param verticalSpacing
- * the spacing between rows.
- * @param horizontalSpan
- * the span for this new composite over the original composite.
- * @param gridDataFill
- * the fill to use for this composite.
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns,
- int verticalSpacing, int horizontalSpan, int gridDataFill) {
- return createComposite(parent, numColumns, verticalSpacing,
- horizontalSpan, gridDataFill, -1, -1, -1);
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @param verticalSpacing
- * the spacing between rows.
- * @param horizontalSpan
- * the span for this new composite over the original composite.
- * @param gridDataFill
- * the fill to use for this composite.
- * @param horizontalSpacing
- * the spacing between objects.
- * @param marginWidth
- * the spacing at start and end of composite.
- * @param marginHeight
- * the spacing above and below composite.
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns,
- int verticalSpacing, int horizontalSpan, int gridDataFill,
- int horizontalSpacing, int marginWidth, int marginHeight) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- if (verticalSpacing >= 0) {
- layout.verticalSpacing = verticalSpacing;
- }
- if (horizontalSpacing >= 0) {
- layout.horizontalSpacing = horizontalSpacing;
- }
- if (marginWidth >= 0) {
- layout.marginWidth = marginWidth;
- }
- if (marginHeight >= 0) {
- layout.marginHeight = marginHeight;
- }
- composite.setLayout(layout);
- GridData gd = new GridData(gridDataFill);
- if (horizontalSpan > 0) {
- gd.horizontalSpan = horizontalSpan;
- }
- composite.setLayoutData(gd);
-
- return composite;
- }
-
- /**
- * Utility method that creates a group and sets the default layout data.
- *
- * @param parent
- * the parent for the new group
- * @param title
- * the label for the new group
- * @param numColumns
- * the number of columns for the new group
- * @return the newly created group
- */
- public static Group createGroup(Composite parent, String title,
- int numColumns) {
- return createGroup(parent, title, numColumns, -1,
- GridData.FILL_HORIZONTAL);
- }
-
- /**
- * Utility method that creates a group and sets the default layout data.
- *
- * @param parent
- * the parent for the new group
- * @param title
- * the label for the new group
- * @param numColumns
- * the number of columns for the new group
- * @param horizontalSpan
- * the number of columns this group should span on the parent
- * composite.
- * @param gridDataFill
- * the fill style of the new group -- set to for filling just
- * around the object: GridData.BEGINNING | GridData.CENTER
- * @return the newly created group
- */
- public static Group createGroup(Composite parent, String title,
- int numColumns, int horizontalSpan, int gridDataFill) {
- Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- group.setLayout(layout);
- GridData data = new GridData(gridDataFill);
-
- if (horizontalSpan > 0) {
- data.horizontalSpan = horizontalSpan;
- }
- group.setLayoutData(data);
- group.setText(title);
- return group;
- }
-
- /**
- * Utility method that creates a label instance and sets the default layout
- * data.
- *
- * @param parent
- * the parent for the new label
- * @param text
- * the text for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @return the new label
- */
- public static Label createLabel(Composite parent, String text,
- int numColumns) {
- return createLabel(parent, text, numColumns, 0);
- }
-
- /**
- * Utility method that creates a label instance and sets the default layout
- * data.
- *
- * @param parent
- * the parent for the new label
- * @param text
- * the text for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @param indent
- * number of pixels to indent from the left
- * @return the new label
- */
- public static Label createLabel(Composite parent, String text,
- int numColumns, int indent) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.horizontalAlignment = GridData.FILL;
- data.horizontalIndent = indent;
- label.setLayoutData(data);
- label.setText(text);
- return label;
- }
-
- /**
- * Create a image label for sticking in a composite. The backgroud color is
- * optional. Because images can have "transparent" natures, you might want
- * to say the background is something other than the defaults composites
- * background.
- *
- * NOTE: the caller is responsible for cleanup of the image and color
- * objects.
- *
- * @param parent
- * the parent for the new label
- * @param theImage
- * the image for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @param background
- * pass null to use the composites background.
- * @return the new label
- */
- public static Label createLabelImage(Composite parent, Image theImage,
- int numColumns, Color background) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- if (background != null) {
- label.setBackground(background);
- }
- label.setImage(theImage);
- return label;
- }
-
- /**
- * Utility method that creates a push button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @return the newly-created button
- */
- public static Button createPushButton(Composite parent, String label) {
- return createPushButton(parent, label, DEFAULT_BUTTON_WIDTH);
- }
-
- /**
- * Utility method that creates a push button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @param widthHint
- * use this width for the button.
- * @return the newly-created button
- */
- public static Button createPushButton(Composite parent, String label,
- int widthHint) {
- Button button = new Button(parent, SWT.PUSH);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL_HORIZONTAL;
- data.widthHint = widthHint;
- button.setLayoutData(data);
- button.setText(label);
- return button;
- }
-
- /**
- * Utility method that creates a push button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param theImage
- * the label for the new button
- * @param widthHint
- * use this width for the button.
- * @return the newly-created button
- */
- public static Button createPushButton(Composite parent, Image theImage,
- int widthHint) {
- Button button = new Button(parent, SWT.PUSH);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL_HORIZONTAL;
- data.widthHint = widthHint;
- button.setLayoutData(data);
- button.setImage(theImage);
- button.setAlignment(SWT.CENTER);
- return button;
- }
-
- /**
- * Utility method that creates a radio button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @return the newly-created button
- */
- public static Button createRadioButton(Composite parent, String label) {
- return createRadioButton(parent, label, DEFAULT_RADIO_FILL);
- }
-
- /**
- * Utility method that creates a radio button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @return the newly-created button
- */
- public static Button createRadioButton(Composite parent, String label,
- int gridDataFill) {
- return createRadioButton(parent, label, gridDataFill, 1);
- }
-
- /**
- * Utility method that creates a radio button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @param horizontalSpan
- * number of columns occupied by button
- * @return the newly-created button
- */
- public static Button createRadioButton(Composite parent, String label,
- int gridDataFill, int horizontalSpan) {
- Button button = new Button(parent, SWT.RADIO | SWT.LEFT);
- GridData data = new GridData(gridDataFill);
- data.horizontalSpan = horizontalSpan;
- button.setLayoutData(data);
- button.setText(label);
- return button;
- }
-
- /**
- * Utility method that creates an empty line
- *
- * @param parent
- * the parent for the new label
- * @param numColumns
- * the number of columns for the new composite
- */
- public static void createSpacer(Composite parent, int numColumns) {
- createSpacer(parent, numColumns, 0);
- }
-
- /**
- * Utility method that creates an empty line
- *
- * @param parent
- * the parent for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @param minWidth
- * minimum width of spacer
- */
- public static void createSpacer(Composite parent, int numColumns,
- int minWidth) {
- Label label = new Label(parent, SWT.NONE);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- label.setLayoutData(data);
- }
-
- /**
- * Create a separator that goes across the entire page
- *
- * @param parent
- * the parent for the new label
- * @param numColumns
- * the number of columns for the new composite
- */
- public static void createSeparator(Composite parent, int numColumns) {
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- separator.setLayoutData(data);
- }
-
- /**
- * Create a table from a TableTree object
- *
- * @param tableTree
- * the TableTree this table is to be created from
- * @param columns
- * A string array containing names of the columns in the order
- * that they should be displayed in the table, or null if no
- * columns need to be created.
- * @return the new table
- */
- public static Table createTable(TableTree tableTree, String[] columns) {
- Table table = tableTree.getTable();
- table.setLayoutData(tableTree.getLayoutData());
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- if (columns != null) {
- for (int i = 0; i < columns.length; i++) {
- /*(void)*/ createTableColumn(table, columns[i], i);
- }
- }
-
- return table;
- }
-
- /**
- * Create a table from a Composite object
- *
- * @param composite
- * the Composite this table is to be created from
- * @param tokenString
- * A string containing names of the columns in the order that
- * they should be displayed in the table with each column
- * separated by a comma(',') or null if no columns need to be
- * created.
- * @param tablewidth
- * the minimum width for the table
- * @return the new table
- */
- public static Table createTable(Composite composite, String tokenString,
- int tablewidth, int tableHeight) {
- // SINGLE, MULTI, CHECK, FULL_SELECTION, HIDE_SELECTION
- int style = SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE | SWT.BORDER
- | SWT.FULL_SELECTION;
- Table table = new Table(composite, style);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- if (tablewidth > 0) {
- gridData.widthHint = tablewidth;
- }
- if (tableHeight > 0) {
- gridData.heightHint = tableHeight;
- }
- table.setLayoutData(gridData);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- if (tokenString != null) {
- String[] columns = getTokenNames(tokenString);
-
- int columnSize = 50;
- if (tablewidth > 0) {
- columnSize = tablewidth / columns.length;
- }
- for (int ii = 0; ii < columns.length; ii++) {
- /*(void)*/ createTableColumn(table, columns[ii], ii,
- columnSize);
- }
- }
-
- return table;
- }
-
- /**
- * Create a table from a Composite object
- *
- * @param composite
- * the Composite this table is to be created from
- * @param columns
- * A string array containing names of the columns in the order
- * that they should be displayed in the table, or null if no
- * columns need to be created.
- * @param tablewidth
- * the minimum width for the table
- * @return the new table
- */
- public static Table createTable(Composite composite, String[] columns,
- int tablewidth) {
- int style = SWT.BORDER | SWT.FULL_SELECTION;
- Table table = new Table(composite, style);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.widthHint = tablewidth;
- table.setLayoutData(gridData);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- if (columns != null) {
- for (int i = 0; i < columns.length; i++) {
- /*(void)*/ createTableColumn(table, columns[i], i);
- }
- }
-
- return table;
- }
-
- /**
- * Create a table column
- *
- * @param parent
- * the table that contains this column
- * @param name
- * name of this column
- * @param index
- * the column within the parent composite
- * @return the new table column
- */
- public static TableColumn createTableColumn(Table parent, String name,
- int index) {
- TableColumn column = new TableColumn(parent, SWT.LEFT, index);
- column.setText(name);
- return column;
- }
-
- /**
- * Create a table column with the image and the width of the column is set
- * to the image width.
- *
- * @param parent
- * the table that contains this column
- * @param image
- * iamge for this column
- * @return the new table column
- */
- public static TableColumn createTableColumn(Table parent, Image image,
- int index) {
- TableColumn column = new TableColumn(parent, SWT.LEFT, index);
- column.setImage(image);
- column.setWidth(image.getBounds().width);
- column.setResizable(false);
- return column;
- }
-
- /**
- * Create a table column
- *
- * @param parent
- * the table that contains this column
- * @param name
- * name of this column
- * @param index
- * the column within the parent composite
- * @param tablewidth
- * the width for the column
- * @return the new table column
- */
- public static TableColumn createTableColumn(Table parent, String name,
- int index, int tablewidth) {
- TableColumn column = new TableColumn(parent, SWT.LEFT, index);
- column.setText(name);
- column.setWidth(tablewidth);
- return column;
- }
-
- /**
- * Create a TableTree object
- *
- * @param parent
- * the composite that contains the TableTree
- * @return the new TableTree object
- */
- public static TableTree createTableTree(Composite parent) {
- int style = SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL
- | SWT.FULL_SELECTION | SWT.HIDE_SELECTION;
- TableTree tableTree = new TableTree(parent, style);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.grabExcessVerticalSpace = true;
- gridData.grabExcessHorizontalSpace = true;
- tableTree.setLayoutData(gridData);
- return tableTree;
- }
-
- /**
- * Create a TableTreeEditor object
- *
- * @param tableTree
- * the TableTree that this editor is for
- * @return the new TableTreeEditor object
- */
- public static TableTreeEditor createTableTreeEditor(TableTree tableTree) {
- TableTreeEditor editor = new TableTreeEditor(tableTree);
- editor.horizontalAlignment = SWT.LEFT;
- editor.grabHorizontal = true;
- editor.minimumWidth = 50;
- return editor;
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @return the new text field
- */
- public static Text createTextBox(Composite parent) {
- return createTextBox(parent, 1, DEFAULT_TEXTBOX_WIDTH);
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, String text) {
- Text textbox = createTextBox(parent, 1);
- textbox.setText(text);
- return textbox;
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, int numColumns) {
- return createTextBox(parent, numColumns, DEFAULT_TEXTBOX_WIDTH);
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, int numColumns,
- int minWidth) {
- return createTextBox(parent, numColumns, minWidth, SWT.DEFAULT);
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, int numColumns,
- int minWidth, int minHeight) {
- Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL);
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- data.heightHint = minHeight;
- text.setLayoutData(data);
- return text;
- }
-
- /**
- * Create a text field that is scrollable.
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @param minHeight
- * minimum height of text field
- * @return the new text field
- */
- public static Text createTextBoxScrollable(Composite parent,
- int numColumns, int minWidth, int minHeight) {
- Text text = new Text(parent, SWT.BORDER | SWT.V_SCROLL | SWT.WRAP);
- GridData data = new GridData((minWidth > 0) ? GridData.FILL
- : GridData.FILL_HORIZONTAL);
- data.horizontalSpan = numColumns;
- if (minWidth > 0) {
- data.widthHint = minWidth;
- }
- data.heightHint = minHeight;
-
- text.setLayoutData(data);
- return text;
- }
-
- /**
- * Create a list with the items listed in it.
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @param minHeight
- * minimum height of text field
- * @param items
- * the items in the list
- * @return the new list
- */
- public static List createList(Composite parent, int numColumns,
- int minWidth, int minHeight, String[] items) {
- return createList(parent, numColumns, minWidth, minHeight, items, true);
- }
-
- /**
- * Create a list with the items listed in it.
- *
- * @param parent
- * the parent of the new list box
- * @param numColumns
- * number of columns the list box is to occupy
- * @param minWidth
- * minimum width of list box
- * @param minHeight
- * minimum height of list box
- * @param items
- * the items in the list
- * @param bmulti
- * whether multiple item selection is allowed
- * @return the new list
- */
- public static List createList(Composite parent, int numColumns,
- int minWidth, int minHeight, String[] items, boolean bmulti) {
- return createList(parent, numColumns, minWidth, minHeight, items,
- bmulti, 1);
- }
-
- /**
- * Create a list with the items listed in it.
- *
- * @param parent
- * the parent of the new list box
- * @param numColumns
- * number of columns the list box is to occupy
- * @param minWidth
- * minimum width of list box
- * @param minHeight
- * minimum height of list box
- * @param items
- * the items in the list
- * @param bmulti
- * whether multiple item selection is allowed
- * @param verticalSpan
- * the number of rows the list box is to occupy
- * @return the new list
- */
- public static List createList(Composite parent, int numColumns,
- int minWidth, int minHeight, String[] items, boolean bmulti,
- int verticalSpan) {
- List theList;
- if (bmulti)
- theList = new List(parent, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI
- | SWT.BORDER);
- else
- theList = new List(parent, SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE
- | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_VERTICAL);
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- data.heightHint = minHeight;
- data.verticalSpan = verticalSpan;
- theList.setLayoutData(data);
- if (items != null) {
- theList.setItems(items);
- }
-
- return theList;
- }
-
- /**
- * Computes the size of the composite inside the scroll area so that scroll
- * bars show up correctly.
- *
- * @param parentComposite
- * @param childComposite
- */
- public static void computeScrollArea(ScrolledComposite parentComposite,
- Composite childComposite) {
- // Point pt = childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- // childComposite.setSize(pt);
-
- Point pt = childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- parentComposite.setExpandHorizontal(true);
- parentComposite.setExpandVertical(true);
- parentComposite.setMinWidth(pt.x);
- parentComposite.setMinHeight(pt.y);
- }
-
- /**
- * Builds an array of strings from a token list string. The token separator
- * is a comma (',').
- *
- * @param tokenString
- * @return String[]
- */
- public static String[] getTokenNames(String tokenString) {
- if (tokenString == null) {
- return new String[0];
- }
-
- return tokenString.split(",");
- }
-
- /**
- * Enable/Disable the widget and all its children.
- *
- * @param widget
- * The widget to be enabled/disabled.
- * @param state
- * Enable widget if true. Disable otherwise.
- */
- public static void setWidgetState(Control widget, boolean state) {
- if (widget instanceof Composite) {
- Control widgets[] = ((Composite) widget).getChildren();
- for (int i = 0; i < widgets.length; i++) {
- setWidgetState(widgets[i], state);
- }
- }
- widget.setEnabled(state);
- }
-
- // ---------------------------------------------------------------------------
- // following is for workaround eclipse problem
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=40281
- static ControlListener _listener = new ControlListener() {
- public void controlResized(ControlEvent e) {
- final Composite c = (Composite) e.widget;
- c.getDisplay().asyncExec(new Runnable() {
- public void run() {
- if (!c.isDisposed()) {
- // XXX: in 3.0, should use c.layout(true)
- // in 3.1, should use c.layout(true, true)
- c.layout(true);
- c.redraw();
- }
- }
- });
- }
-
- public void controlMoved(ControlEvent e) {
- // nothing for move
- }
- };
-
- public static void workaroundResize(Composite composite) {
- composite.addControlListener(_listener);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java
deleted file mode 100644
index 122d85efc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.guiutils;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Brings up a simple text window.
- *
- * @author mengbo
- */
-public class TextWindow extends ApplicationWindow {
- // this browser will be cleaned up when they close the window.
- private Text _text;
-
- private String _content;
-
- private Point _size = new Point(600, 600);
-
- /**
- * empty for passing from events.
- */
- public TextWindow(Shell parentShell, String content) {
- super(parentShell);
- // addStatusLine();
- _content = content;
- // addCoolBar(SWT.BORDER);
- // addMenuBar();
- // addToolBar(SWT.BORDER);
- }
-
- public Text getTextWidget() {
- return _text;
- }
-
- protected Control createContents(Composite parent) {
- // _text = new Text(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- // _text.setText(_content);
- // return _text;
-
- TextViewer tview = new TextViewer(parent, SWT.BORDER | SWT.V_SCROLL
- | SWT.H_SCROLL);
- tview.setDocument(new Document(_content));
-
- return tview.getControl();
- }
-
- public void setStartSize(Point pp) {
- _size = pp;
- }
-
- protected Point getInitialSize() {
- return _size;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java
deleted file mode 100644
index dc1a3e6d3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java
+++ /dev/null
@@ -1,160 +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.common.ui.internal.logging;
-
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-public class Logger {
- private ResourceBundle resourceBundle;
-
- private ILog log;
-
- private String bundleId;
-
- public Logger(Bundle bundle, ResourceBundle resourceBundle) {
- log = Platform.getLog(bundle);
- this.resourceBundle = resourceBundle;
- bundleId = bundle.getSymbolicName();
- if (resourceBundle == null) {
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- "The resource Bundle for logger could not be null!", null);
- log.log(status);
- }
- }
- public void info(String key, String arg0) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- public void info(String message) {
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- public void info(String key, Throwable e) {
- String message = getString(key);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- public void info(String key, String arg0, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- public void info(String key, String arg0, String arg1, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- public void error(String key) {
-
- String message = getString(key);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- public void error(Throwable e) {
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK, "", e);
- log.log(status);
- }
-
- public void error(String key, Throwable e) {
- String message = getString(key);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- public void error(String key, String arg0) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- public void error(String key, String arg, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- public void error(String key, String arg0, String arg1, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- /**
- * @param key
- * @return the resource for the key, or an error message if
- * resourceBundle.getString(key) throws an Exception
- */
- private String getString(String key)
- {
- try
- {
- return resourceBundle.getString(key);
- }
- // suppress non-error exceptions so that the logging operation
- // itself (usually called in response to an exception) does not
- // throw a new exception
- catch(Exception e)
- {
- return "!!missing resource: " + key + "!!";
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java
deleted file mode 100644
index d084f5aae..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * This provides a means to store common properties for pages.
- *
- * Holds a <code>List</code> of <code>Properties</code> which can be
- * manipulated by the user.
- *
- * @author mengbo
- */
-public class FavoriteConfigurations {
- private static Logger _log = JSFUICommonPlugin
- .getLogger(FavoriteConfigurations.class);
-
- private final static String FAV_EXTENSIONS = ".xml";
-
- private final static String ELEMENT_ROOT = "favorite";
-
- private final static String ELEMENT_CONFIG = "config";
-
- private final static String ELEMENT_NAME = "name";
-
- private final static String ELEMENT_PROPERTY = "property";
-
- private final static String ELEMENT_VALUE = "value";
-
- private Map _favorites;
-
- private IPath _favoriteFile;
-
- private String _favoriteName;
-
- /**
- * Constructor
- *
- * @param plugin
- * used for location of favorite file.
- * @param favoriteName
- * used for name of file and for mapping the properties of this
- * favorite.
- */
- public FavoriteConfigurations(AbstractUIPlugin plugin, String favoriteName) {
- super();
- _favoriteFile = plugin.getStateLocation().append(
- scanFileName(favoriteName) + FAV_EXTENSIONS);
- readFavorites();
- }
-
- /**
- * Returns the favorite entry that is mapped under the given name.
- *
- * @param name
- * the favorite
- * @return <code>Properties</code> config entry for the favorite.
- */
- public Properties getFavorite(String name) {
- return (Properties) _favorites.get(name);
- }
-
- /**
- * Stores the Favorites into the plugin directory.
- */
- public void saveFavorites() {
- FileWriter fw = null;
- try {
- XMLMemento memento = XMLMemento.createWriteRoot(ELEMENT_ROOT);
- for (Iterator it = _favorites.keySet().iterator(); it.hasNext();) {
- String favName = (String) it.next();
- Map props = new HashMap((Properties) _favorites.get(favName));
-
- IMemento config = memento.createChild(ELEMENT_CONFIG);
- config.putString(ELEMENT_NAME, favName);
-
- for (Iterator it1 = props.keySet().iterator(); it1.hasNext();) {
- IMemento entry = config.createChild(ELEMENT_PROPERTY);
- String name = (String) it1.next();
- entry.putString(ELEMENT_NAME, name);
- entry.putString(ELEMENT_VALUE, (String) props.get(name));
- }
- }
- fw = new FileWriter(_favoriteFile.toFile());
- memento.save(fw);
- } catch (Exception ee) {
- // log.FavoriteConfigurations.save.error=Failed to save {0}
- // favorites. File={1}
- _log.info("log.FavoriteConfigurations.save.error", _favoriteName,
- _favoriteFile.toOSString(), ee);
- } finally {
- if (fw != null) {
- try {
- fw.close();
- } catch (IOException ee)// NOPMD
- {
- // nothing to do when IOException throwed in closing files.
- }
- }
- }
- }
-
- /**
- * Add the favorite into the internal structure but don't save until
- * saveFavorites() is called.
- *
- * @param name
- * @param config
- */
- public void addFavorite(String name, Properties config) {
- _favorites.put(name, config);
- }
-
- /**
- * Removes the Favorite that is mapped under the given name.
- *
- * @param name
- * the name of the configuration
- */
- public void removeFavorite(String name) {
- _favorites.remove(name);
- }
-
- /**
- * Read the favorites from the disk into the memory structure.
- */
- protected void readFavorites() {
- _favorites = new HashMap();
- FileReader fr = null;
- try {
- try {
- fr = new FileReader(_favoriteFile.toFile());
- } catch (FileNotFoundException ee)// NOPMD
- {
- // no error here since they don't have to have a favorites...
- }
- if (fr != null) {
- XMLMemento memento = XMLMemento.createReadRoot(fr);
- IMemento[] children = memento.getChildren(ELEMENT_CONFIG);
- for (int ii = 0; ii < children.length; ii++) {
- Properties props = new Properties();
- IMemento config = children[ii];
- String name = config.getString(ELEMENT_NAME);
-
- IMemento[] configProperties = config
- .getChildren(ELEMENT_PROPERTY);
- for (int jj = 0; jj < configProperties.length; jj++) {
- IMemento entry = configProperties[jj];
- setProperty(props, entry.getString(ELEMENT_NAME), entry
- .getString(ELEMENT_VALUE));
- }
- _favorites.put(name, props);
- }
- }
- } catch (Exception ee) {
- // log.FavoriteConfigurations.read.error=Failed to save {0}
- // favorites. File={1}
- _log.error("log.FavoriteConfigurations.read.error", _favoriteName,
- _favoriteFile.toOSString(), ee);
- } finally {
- if (fr != null) {
- try {
- fr.close();
- } catch (IOException ee)// NOPMD
- {
- // nothing to do when IOException throwed in closing files.
- }
- }
- }
- }
-
- /**
- * Set the value in the properties object.
- *
- * @param props
- * @param name
- * @param value
- */
- private void setProperty(Properties props, String name, String value) {
- if (name != null && value != null) {
- props.setProperty(name, value);
- }
- }
-
- /**
- * Get a list of all the favorites stored in this file.
- *
- * @return list of favorites
- */
- public String[] getFavoritesList() {
- Object[] objs = _favorites.keySet().toArray();
- String[] names = new String[objs.length];
-
- for (int ii = 0; ii < objs.length; ii++) {
- names[ii] = (String) objs[ii];
- }
- Arrays.sort(names);
-
- return names;
- }
-
- /**
- * scan the file name for any bad character that would fail when trying to
- * create the file. We replace bad characters with '_'
- */
- private static String scanFileName(String filename) {
- StringBuffer strBuf = new StringBuffer();
- char[] chars = filename.toCharArray();
-
- for (int ii = 0; ii < chars.length; ii++) {
- switch (chars[ii]) {
- case '&':
- case '\\':
- case '/':
- case ' ':
- case '\t':
- case ':':
- case '.':
- case '\"':
- case '\'':
- case '@':
- strBuf.append('_');
- break;
- default:
- strBuf.append(chars[ii]);
- break;
- }
- }
-
- return strBuf.toString();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JMTEntityResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JMTEntityResolver.java
deleted file mode 100644
index 600abf009..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JMTEntityResolver.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
-/**
- * The Entity Resolver for loading local dtd copies. Currently setup for:
- * <ul>
- * <li>web.xml (V2.3)</li>
- * <li>faces-config.xml (V1.0)</li>
- * <li>faces-config.xml (V1.1)</li>
- * </ul>
- *
- * <pre>
- * For Example:
- * </pre>
- * <pre>
- * SAXReader reader = new SAXReader();
- * reader.setIgnoreComments(false);
- * JMTEntityResolver resolver = new JMTEntityResolver();
- * reader.setEntityResolver(resolver);
- * </pre>
- *
- * @author mengbo
- * @version 1.5
- */
-public class JMTEntityResolver implements EntityResolver {
- public InputSource resolveEntity(String publicId, String systemId) {
- String localURL;
- if (systemId
- .equalsIgnoreCase("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd")) {
- localURL = "dtd/web-app_2_2.dtd";
- } else if (systemId
- .equalsIgnoreCase("http://java.sun.com/dtd/web-app_2_3.dtd")) //$NON-NLS-1$
- {
- localURL = "dtd/web-app_2_3.dtd"; //$NON-NLS-1$
- } else if (systemId
- .equalsIgnoreCase("http://java.sun.com/dtd/web-facesconfig_1_0.dtd")) //$NON-NLS-1$
- {
- localURL = "dtd/web-facesconfig_1_0.dtd"; //$NON-NLS-1$
- } else if (systemId
- .equalsIgnoreCase("http://java.sun.com/dtd/web-facesconfig_1_1.dtd")) //$NON-NLS-1$
- {
- localURL = "dtd/web-facesconfig_1_1.dtd"; //$NON-NLS-1$
- } else {
- // use the default behaviour
- return null;
- }
-
- JSFUICommonPlugin plugin = JSFUICommonPlugin.getDefault();
- URL url = FileLocator.find(Platform.getBundle(JSFUICommonPlugin.getPluginId()),
- new Path(localURL), null);
- InputSource source = null;
- try {
- source = new InputSource(url.openStream());
- source.setPublicId(publicId);
- } catch (IOException e) {
- Logger log = plugin.getRootLogger();
- log.error("Web.XML.DTDError", e); //$NON-NLS-1$
- }
- return source;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java
deleted file mode 100644
index b28a1c04d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java
+++ /dev/null
@@ -1,1004 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportContainer;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-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.core.compiler.CharOperation;
-
-/**
- * Original code is from JDT Utility methods for the Java Model.
- */
-public final class JavaModelUtil {
-
- /**
- * Finds a type by its qualified type name (dot separated).
- *
- * @param jproject
- * The java project to search in
- * @param fullyQualifiedName
- * The fully qualified name (type name with enclosing type names
- * and package (all separated by dots))
- * @return The type found, or null if not existing
- */
- public static IType findType(IJavaProject jproject,
- String fullyQualifiedName) throws JavaModelException {
- // workaround for bug 22883
- IType type = jproject.findType(fullyQualifiedName);
- if (type != null) {
- return type;
- }
- IPackageFragmentRoot[] roots = jproject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- type = findType(root, fullyQualifiedName);
- if (type != null && type.exists()) {
- return type;
- }
- }
- return null;
- }
-
- /**
- * Returns <code>true</code> if the given package fragment root is
- * referenced. This means it is own by a different project but is referenced
- * by the root's parent. Returns <code>false</code> if the given root
- * doesn't have an underlying resource.
- */
- public static boolean isReferenced(IPackageFragmentRoot root) {
- IResource resource = root.getResource();
- if (resource != null) {
- IProject jarProject = resource.getProject();
- IProject container = root.getJavaProject().getProject();
- return !container.equals(jarProject);
- }
- return false;
- }
-
- private static IType findType(IPackageFragmentRoot root,
- String fullyQualifiedName) throws JavaModelException {
- IJavaElement[] children = root.getChildren();
- for (int i = 0; i < children.length; i++) {
- IJavaElement element = children[i];
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- IPackageFragment pack = (IPackageFragment) element;
- if (!fullyQualifiedName.startsWith(pack.getElementName())) {
- continue;
- }
- IType type = findType(pack, fullyQualifiedName);
- if (type != null && type.exists()) {
- return type;
- }
- }
- }
- return null;
- }
-
- private static IType findType(IPackageFragment pack,
- String fullyQualifiedName) throws JavaModelException {
- ICompilationUnit[] cus = pack.getCompilationUnits();
- for (int i = 0; i < cus.length; i++) {
- ICompilationUnit unit = cus[i];
- IType type = findType(unit, fullyQualifiedName);
- if (type != null && type.exists()) {
- return type;
- }
- }
- return null;
- }
-
- private static IType findType(ICompilationUnit cu, String fullyQualifiedName)
- throws JavaModelException {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- IType type = types[i];
- if (getFullyQualifiedName(type).equals(fullyQualifiedName)) {
- return type;
- }
- }
- return null;
- }
-
- /**
- * Finds a type by package and type name.
- *
- * @param jproject
- * the java project to search in
- * @param pack
- * The package name
- * @param typeQualifiedName
- * the type qualified name (type name with enclosing type names
- * (separated by dots))
- * @return the type found, or null if not existing
- * @deprecated Use IJavaProject.findType(String, String) instead
- */
- public static IType findType(IJavaProject jproject, String pack,
- String typeQualifiedName) throws JavaModelException {
- return jproject.findType(pack, typeQualifiedName);
- }
-
- /**
- * Finds a type container by container name. The returned element will be of
- * type <code>IType</code> or a <code>IPackageFragment</code>.
- * <code>null</code> is returned if the type container could not be found.
- *
- * @param jproject
- * The Java project defining the context to search
- * @param typeContainerName
- * A dot separarted name of the type container
- * @see #getTypeContainerName(IType)
- */
- public static IJavaElement findTypeContainer(IJavaProject jproject,
- String typeContainerName) throws JavaModelException {
- // try to find it as type
- IJavaElement result = jproject.findType(typeContainerName);
- if (result == null) {
- // find it as package
- IPath path = new Path(typeContainerName.replace('.', '/'));
- result = jproject.findElement(path);
- if (!(result instanceof IPackageFragment)) {
- result = null;
- }
-
- }
- return result;
- }
-
- /**
- * Finds a type in a compilation unit. Typical usage is to find the
- * corresponding type in a working copy.
- *
- * @param cu
- * the compilation unit to search in
- * @param typeQualifiedName
- * the type qualified name (type name with enclosing type names
- * (separated by dots))
- * @return the type found, or null if not existing
- */
- public static IType findTypeInCompilationUnit(ICompilationUnit cu,
- String typeQualifiedName) throws JavaModelException {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- String currName = getTypeQualifiedName(types[i]);
- if (typeQualifiedName.equals(currName)) {
- return types[i];
- }
- }
- return null;
- }
-
- /**
- * Finds a a member in a compilation unit. Typical usage is to find the
- * corresponding member in a working copy.
- *
- * @param cu
- * the compilation unit (eg. working copy) to search in
- * @param member
- * the member (eg. from the original)
- * @return the member found, or null if not existing
- */
- public static IMember findMemberInCompilationUnit(ICompilationUnit cu,
- IMember member) {
- IJavaElement[] elements = cu.findElements(member);
- if (elements != null && elements.length > 0) {
- return (IMember) elements[0];
- }
- return null;
- }
-
- /**
- * Returns the element of the given compilation unit which is "equal" to the
- * given element. Note that the given element usually has a parent different
- * from the given compilation unit.
- *
- * @param cu
- * the cu to search in
- * @param element
- * the element to look for
- * @return an element of the given cu "equal" to the given element
- */
- public static IJavaElement findInCompilationUnit(ICompilationUnit cu,
- IJavaElement element) {
- IJavaElement[] elements = cu.findElements(element);
- if (elements != null && elements.length > 0) {
- return elements[0];
- }
- return null;
- }
-
- /**
- * Returns the qualified type name of the given type using '.' as
- * separators. This is a replace for IType.getTypeQualifiedName() which uses
- * '$' as separators. As '$' is also a valid character in an id this is
- * ambiguous. JavaCore PR: 1GCFUNT
- */
- public static String getTypeQualifiedName(IType type) {
- return type.getTypeQualifiedName('.');
- }
-
- /**
- * Returns the fully qualified name of the given type using '.' as
- * separators. This is a replace for IType.getFullyQualifiedTypeName which
- * uses '$' as separators. As '$' is also a valid character in an id this is
- * ambiguous. JavaCore PR: 1GCFUNT
- */
- public static String getFullyQualifiedName(IType type) {
- return type.getFullyQualifiedName('.');
- }
-
- /**
- * Returns the fully qualified name of a type's container. (package name or
- * enclosing type name)
- */
- public static String getTypeContainerName(IType type) {
- IType outerType = type.getDeclaringType();
- if (outerType != null) {
- return outerType.getFullyQualifiedName('.');
- }
- return type.getPackageFragment().getElementName();
- }
-
- /**
- * Concatenates two names. Uses a dot for separation. Both strings can be
- * empty or <code>null</code>.
- */
- public static String concatenateName(String name1, String name2) {
- StringBuffer buf = new StringBuffer();
- if (name1 != null && name1.length() > 0) {
- buf.append(name1);
- }
- if (name2 != null && name2.length() > 0) {
- if (buf.length() > 0) {
- buf.append('.');
- }
- buf.append(name2);
- }
- return buf.toString();
- }
-
- /**
- * Concatenates two names. Uses a dot for separation. Both strings can be
- * empty or <code>null</code>.
- */
- public static String concatenateName(char[] name1, char[] name2) {
- StringBuffer buf = new StringBuffer();
- if (name1 != null && name1.length > 0) {
- buf.append(name1);
- }
- if (name2 != null && name2.length > 0) {
- if (buf.length() > 0) {
- buf.append('.');
- }
- buf.append(name2);
- }
- return buf.toString();
- }
-
- /**
- * Evaluates if a member (possible from another package) is visible from
- * elements in a package.
- *
- * @param member
- * The member to test the visibility for
- * @param pack
- * The package in focus
- */
- public static boolean isVisible(IMember member, IPackageFragment pack)
- throws JavaModelException {
-
- int type = member.getElementType();
- if (type == IJavaElement.INITIALIZER
- || (type == IJavaElement.METHOD && member.getElementName()
- .startsWith("<"))) {
- //$NON-NLS-1$
- return false;
- }
-
- int otherflags = member.getFlags();
- IType declaringType = member.getDeclaringType();
- if (Flags.isPublic(otherflags)
- || (declaringType != null && declaringType.isInterface())) {
- return true;
- } else if (Flags.isPrivate(otherflags)) {
- return false;
- }
-
- IPackageFragment otherpack = (IPackageFragment) findParentOfKind(
- member, IJavaElement.PACKAGE_FRAGMENT);
- return (pack != null && otherpack != null && isSamePackage(pack,
- otherpack));
- }
-
- /**
- * Evaluates if a member in the focus' element hierarchy is visible from
- * elements in a package.
- *
- * @param member
- * The member to test the visibility for
- * @param pack
- * The package of the focus element focus
- */
- public static boolean isVisibleInHierarchy(IMember member,
- IPackageFragment pack) throws JavaModelException {
- int type = member.getElementType();
- if (type == IJavaElement.INITIALIZER
- || (type == IJavaElement.METHOD && member.getElementName()
- .startsWith("<"))) {
- //$NON-NLS-1$
- return false;
- }
-
- int otherflags = member.getFlags();
-
- IType declaringType = member.getDeclaringType();
- if (Flags.isPublic(otherflags) || Flags.isProtected(otherflags)
- || (declaringType != null && declaringType.isInterface())) {
- return true;
- } else if (Flags.isPrivate(otherflags)) {
- return false;
- }
-
- IPackageFragment otherpack = (IPackageFragment) findParentOfKind(
- member, IJavaElement.PACKAGE_FRAGMENT);
- return (pack != null && pack.equals(otherpack));
- }
-
- /**
- * Returns the package fragment root of <code>IJavaElement</code>. If the
- * given element is already a package fragment root, the element itself is
- * returned.
- */
- public static IPackageFragmentRoot getPackageFragmentRoot(
- IJavaElement element) {
- return (IPackageFragmentRoot) element
- .getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
- }
-
- /**
- * Returns the parent of the supplied java element that conforms to the
- * given parent type or <code>null</code>, if such a parent doesn't exit.
- *
- * @deprecated Use element.getParent().getAncestor(kind);
- */
- public static IJavaElement findParentOfKind(IJavaElement element, int kind) {
- if (element != null && element.getParent() != null) {
- return element.getParent().getAncestor(kind);
- }
- return null;
- }
-
- /**
- * Finds a method in a type. This searches for a method with the same name
- * and 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
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first found method or <code>null</code>, if nothing found
- */
- public static IMethod findMethod(String name, String[] paramTypes,
- boolean isConstructor, IType type) throws JavaModelException {
- return findMethod(name, paramTypes, isConstructor, type.getMethods());
- }
-
- /**
- * Finds a method by name. This searches for a method with a name and
- * 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
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @param methods
- * The methods to search in
- * @return The found method or <code>null</code>, if nothing found
- */
- public static IMethod findMethod(String name, String[] paramTypes,
- boolean isConstructor, IMethod[] methods) throws JavaModelException {
- for (int i = methods.length - 1; i >= 0; i--) {
- if (isSameMethodSignature(name, paramTypes, isConstructor,
- methods[i])) {
- return methods[i];
- }
- }
- return null;
- }
-
- /**
- * Finds a method declararion in a type's hierarchy. The search is top down,
- * so this returns the first declaration of the method in the hierarchy.
- * This searches for a method with a name and 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 type
- * Searches in this type's supertypes.
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first method found or null, if nothing found
- */
- public static IMethod findMethodDeclarationInHierarchy(
- ITypeHierarchy hierarchy, IType type, String name,
- String[] paramTypes, boolean isConstructor)
- throws JavaModelException {
- IType[] superTypes = hierarchy.getAllSupertypes(type);
- for (int i = superTypes.length - 1; i >= 0; i--) {
- IMethod first = findMethod(name, paramTypes, isConstructor,
- superTypes[i]);
- if (first != null && !Flags.isPrivate(first.getFlags())) {
- // the order getAllSupertypes does make assumptions of the order
- // of inner elements -> search recursivly
- IMethod res = findMethodDeclarationInHierarchy(hierarchy, first
- .getDeclaringType(), name, paramTypes, isConstructor);
- if (res != null) {
- return res;
- }
- return first;
- }
- }
- return null;
- }
-
- /**
- * Finds a method implementation in a type's classhierarchy. The search is
- * bottom-up, so this returns the nearest overridden method. Does not find
- * methods in interfaces or abstract methods. This searches for a method
- * with a name and 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 type
- * Type to search the superclasses
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first method found or null, if nothing found
- */
- public static IMethod findMethodImplementationInHierarchy(
- ITypeHierarchy hierarchy, IType type, String name,
- String[] paramTypes, boolean isConstructor)
- throws JavaModelException {
- IType[] superTypes = hierarchy.getAllSuperclasses(type);
- for (int i = 0; i < superTypes.length; i++) {
- IMethod found = findMethod(name, paramTypes, isConstructor,
- superTypes[i]);
- if (found != null) {
- if (Flags.isAbstract(found.getFlags())) {
- return null;
- }
- return found;
- }
- }
- return null;
- }
-
- private static IMethod findMethodInHierarchy(ITypeHierarchy hierarchy,
- IType type, String name, String[] paramTypes, boolean isConstructor)
- throws JavaModelException {
- IMethod method = findMethod(name, paramTypes, isConstructor, type);
- if (method != null) {
- return method;
- }
- IType superClass = hierarchy.getSuperclass(type);
- if (superClass != null) {
- IMethod res = findMethodInHierarchy(hierarchy, superClass, name,
- paramTypes, isConstructor);
- if (res != null) {
- return res;
- }
- }
- if (!isConstructor) {
- IType[] superInterfaces = hierarchy.getSuperInterfaces(type);
- for (int i = 0; i < superInterfaces.length; i++) {
- IMethod res = findMethodInHierarchy(hierarchy,
- superInterfaces[i], name, paramTypes, false);
- if (res != null) {
- return res;
- }
- }
- }
- return method;
- }
-
- /**
- * Finds the method that is defines/declares the given method. The search is
- * bottom-up, so this returns the nearest defining/declaring method.
- *
- * @param testVisibility
- * If true the result is tested on visibility. Null is returned
- * if the method is not visible.
- * @throws JavaModelException
- */
- public static IMethod findMethodDefininition(ITypeHierarchy typeHierarchy,
- IType type, String methodName, String[] paramTypes,
- boolean isConstructor, boolean testVisibility)
- throws JavaModelException {
- IType superClass = typeHierarchy.getSuperclass(type);
- if (superClass != null) {
- IMethod res = findMethodInHierarchy(typeHierarchy, superClass,
- methodName, paramTypes, isConstructor);
- if (res != null && !Flags.isPrivate(res.getFlags())) {
- if (!testVisibility
- || isVisibleInHierarchy(res, type.getPackageFragment())) {
- return res;
- }
- }
- }
- if (!isConstructor) {
- IType[] interfaces = typeHierarchy.getSuperInterfaces(type);
- for (int i = 0; i < interfaces.length; i++) {
- IMethod res = findMethodInHierarchy(typeHierarchy,
- interfaces[i], methodName, paramTypes, false);
- if (res != null) {
- return res; // methods from interfaces are always public and
- // therefore visible
- }
- }
- }
- return null;
- }
-
- /**
- * 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>
- * @param isConstructor
- * Specifies if the method is a constructor
- * @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, boolean isConstructor, IMethod curr)
- throws JavaModelException {
- if (isConstructor || name.equals(curr.getElementName())) {
- if (isConstructor == curr.isConstructor()) {
- 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;
- }
-
- /**
- * Tests if two <code>IPackageFragment</code>s represent the same logical
- * java package.
- *
- * @return <code>true</code> if the package fragments' names are equal.
- */
- public static boolean isSamePackage(IPackageFragment pack1,
- IPackageFragment pack2) {
- return pack1.getElementName().equals(pack2.getElementName());
- }
-
- /**
- * Checks whether the given type has a valid main method or not.
- */
- public static boolean hasMainMethod(IType type) throws JavaModelException {
- IMethod[] methods = type.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isMainMethod()) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Checks if the field is boolean.
- */
- public static boolean isBoolean(IField field) throws JavaModelException {
- return field.getTypeSignature().equals(Signature.SIG_BOOLEAN);
- }
-
- /**
- * Returns true if the element is on the build path of the given project
- *
- * @deprecated Use jproject.isOnClasspath(element);
- */
- public static boolean isOnBuildPath(IJavaProject jproject,
- IJavaElement element) {
- return jproject.isOnClasspath(element);
- }
-
- /**
- * Tests if the given element is on the class path of its containing
- * project. Handles the case that the containing project isn't a Java
- * project.
- */
- public static boolean isOnClasspath(IJavaElement element) {
- IJavaProject project = element.getJavaProject();
- if (!project.exists())
- return false;
- return project.isOnClasspath(element);
- }
-
- /**
- * Resolves a type name in the context of the declaring type.
- *
- * @param refTypeSig
- * the type name in signature notation (for example 'QVector')
- * this can also be an array type, but dimensions will be
- * ignored.
- * @param declaringType
- * the context for resolving (type where the reference was made
- * in)
- * @return returns the fully qualified type name or build-in-type name. if a
- * unresoved type couldn't be resolved null is returned
- */
- public static String getResolvedTypeName(String refTypeSig,
- IType declaringType) throws JavaModelException {
- int arrayCount = Signature.getArrayCount(refTypeSig);
- char type = refTypeSig.charAt(arrayCount);
- if (type == Signature.C_UNRESOLVED) {
- int semi = refTypeSig
- .indexOf(Signature.C_SEMICOLON, arrayCount + 1);
- if (semi == -1) {
- throw new IllegalArgumentException();
- }
- String name = refTypeSig.substring(arrayCount + 1, semi);
-
- String[][] resolvedNames = declaringType.resolveType(name);
- if (resolvedNames != null && resolvedNames.length > 0) {
- return JavaModelUtil.concatenateName(resolvedNames[0][0],
- resolvedNames[0][1]);
- }
- return null;
- }
- return Signature.toString(refTypeSig.substring(arrayCount));
- }
-
- /**
- * Returns if a CU can be edited.
- */
- public static boolean isEditable(ICompilationUnit cu) {
- IResource resource = toOriginal(cu).getResource();
- return (resource.exists() && !resource.getResourceAttributes()
- .isReadOnly());
- }
-
- /**
- * Finds a qualified import for a type name.
- */
- public static IImportDeclaration findImport(ICompilationUnit cu,
- String simpleName) throws JavaModelException {
- IImportDeclaration[] existing = cu.getImports();
- for (int i = 0; i < existing.length; i++) {
- String curr = existing[i].getElementName();
- if (curr.endsWith(simpleName)) {
- int dotPos = curr.length() - simpleName.length() - 1;
- if ((dotPos == -1)
- || (dotPos > 0 && curr.charAt(dotPos) == '.')) {
- return existing[i];
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the original if the given member. If the member is already an
- * original the input is returned. The returned member might not exist
- */
- public static IMember toOriginal(IMember member) {
- if (member instanceof IMethod) {
- return toOriginalMethod((IMethod) member);
- }
-
- return (IMember) member.getPrimaryElement();
- /*
- * ICompilationUnit cu= member.getCompilationUnit(); if (cu != null &&
- * cu.isWorkingCopy()) return (IMember)cu.getOriginal(member); return
- * member;
- */
- }
-
- /*
- * XXX workaround for bug 18568
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=18568 to be removed once the
- * bug is fixed
- */
- private static IMethod toOriginalMethod(IMethod method) {
- ICompilationUnit cu = method.getCompilationUnit();
- if (cu == null || isPrimary(cu)) {
- return method;
- }
- try {
- // use the workaround only if needed
- if (!method.getElementName().equals(
- method.getDeclaringType().getElementName()))
- return (IMethod) method.getPrimaryElement();
-
- IType originalType = (IType) toOriginal(method.getDeclaringType());
- IMethod[] methods = originalType.findMethods(method);
- boolean isConstructor = method.isConstructor();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isConstructor() == isConstructor)
- return methods[i];
- }
- return null;
- } catch (JavaModelException e) {
- return null;
- }
- }
-
- // private static boolean PRIMARY_ONLY = false;
-
- /**
- * Returns the original cu if the given cu is a working copy. If the cu is
- * already an original the input cu is returned. The returned cu might not
- * exist
- */
- public static ICompilationUnit toOriginal(ICompilationUnit cu) {
- // To stay compatible with old version returned null
- // if cu is null
- if (cu == null)
- return cu;
- return cu.getPrimary();
- }
-
- /**
- * Returns the original element if the given element is a working copy. If
- * the cu is already an original the input element is returned. The returned
- * element might not exist
- */
- public static IJavaElement toOriginal(IJavaElement element) {
- return element.getPrimaryElement();
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IMember toWorkingCopy(IMember member) {
- return member;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IPackageDeclaration toWorkingCopy(
- IPackageDeclaration declaration) {
- return declaration;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IJavaElement toWorkingCopy(IJavaElement elem) {
- return elem;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IImportContainer toWorkingCopy(IImportContainer container) {
- return container;
-
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static IImportDeclaration toWorkingCopy(
- IImportDeclaration importDeclaration) {
- return importDeclaration;
- }
-
- /**
- * @deprecated Inline this method.
- */
- public static ICompilationUnit toWorkingCopy(ICompilationUnit cu) {
- return cu;
- }
-
- /**
- * Returns true if a cu is a primary cu (original or shared working copy)
- */
- public static boolean isPrimary(ICompilationUnit cu) {
- return cu.getOwner() == null;
- }
-
- /*
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
- *
- * Reconciling happens in a separate thread. This can cause a situation
- * where the Java element gets disposed after an exists test has been done.
- * So we should not log not present exceptions when they happen in working
- * copies.
- */
- public static boolean filterNotPresentException(CoreException exception) {
- if (!(exception instanceof JavaModelException)) {
- return true;
- }
- JavaModelException je = (JavaModelException) exception;
- if (!je.isDoesNotExist()) {
- return true;
- }
- IJavaElement[] elements = je.getJavaModelStatus().getElements();
- for (int i = 0; i < elements.length; i++) {
- IJavaElement element = elements[i];
- ICompilationUnit unit = (ICompilationUnit) element
- .getAncestor(IJavaElement.COMPILATION_UNIT);
- if (unit == null) {
- return true;
- }
- if (!unit.isWorkingCopy()) {
- return true;
- }
- }
- return false;
- }
-
- public static IType[] getAllSuperTypes(IType type, IProgressMonitor pm)
- throws JavaModelException {
- // workaround for 23656
- Set types = new HashSet(Arrays.asList(type.newSupertypeHierarchy(pm)
- .getAllSupertypes(type)));
- IType objekt = type.getJavaProject().findType("java.lang.Object");//$NON-NLS-1$
- if (objekt != null) {
- types.add(objekt);
- }
- return (IType[]) types.toArray(new IType[types.size()]);
- }
-
- public static boolean isExcludedPath(IPath resourcePath,
- IPath[] exclusionPatterns) {
- char[] path = resourcePath.toString().toCharArray();
- for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
- char[] pattern = exclusionPatterns[i].toString().toCharArray();
- if (CharOperation.pathMatch(pattern, path, true, '/')) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * Returns whether the given resource path matches one of the exclusion
- * patterns.
- *
- * @see IClasspathEntry#getExclusionPatterns
- */
- public static boolean isExcluded(IPath resourcePath,
- char[][] exclusionPatterns) {
- if (exclusionPatterns == null) {
- return false;
- }
- char[] path = resourcePath.toString().toCharArray();
- for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
- if (CharOperation.pathMatch(exclusionPatterns[i], path, true, '/')) {
- return true;
- }
- }
- return false;
- }
-
- private static Boolean fgIsJDTCore_1_5 = null;
-
- /**
- * Return true if JRE 1.5 in enabled.
- */
- public static boolean isJDTCore_1_5() {
- if (fgIsJDTCore_1_5 == null) {
- fgIsJDTCore_1_5 = JavaCore
- .getDefaultOptions()
- .containsKey(
- "org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation") ? Boolean.TRUE
- : Boolean.FALSE;
- }
- return fgIsJDTCore_1_5.booleanValue();
- }
-
- /**
- * Helper method that tests if an classpath entry can be found in a
- * container. <code>null</code> is returned if the entry can not be found
- * or if the container does not allows the configuration of source
- * attachments
- *
- * @param jproject
- * The container's parent project
- * @param containerPath
- * The path of the container
- * @param libPath
- * The path of the library to be found
- * @return IClasspathEntry A classpath entry from the container of
- * <code>null</code> if the container can not be modified.
- */
- public static IClasspathEntry getClasspathEntryToEdit(
- IJavaProject jproject, IPath containerPath, IPath libPath)
- throws JavaModelException {
- IClasspathContainer container = JavaCore.getClasspathContainer(
- containerPath, jproject);
- ClasspathContainerInitializer initializer = JavaCore
- .getClasspathContainerInitializer(containerPath.segment(0));
- if (container != null
- && initializer != null
- && initializer.canUpdateClasspathContainer(containerPath,
- jproject)) {
- IClasspathEntry[] entries = container.getClasspathEntries();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry curr = entries[i];
- IClasspathEntry resolved = JavaCore
- .getResolvedClasspathEntry(curr);
- if (resolved != null && libPath.equals(resolved.getPath())) {
- return curr; // return the real entry
- }
- }
- }
- return null; // attachment not possible
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java
deleted file mode 100644
index c7c75c876..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.io.File;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.internal.core.JarEntryFile;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.ui.IFileEditorInput;
-
-/**
- * Collection of helper methods to manage and convert links Originally part of
- * the LinksManager (com.ibm.iwt.parser.util)
- */
-public class PathUtil {
- public static final String BACKWARD_SLASH = "\\"; //$NON-NLS-1$
-
- public static final String FORWARD_SLASH = "/"; //$NON-NLS-1$
-
- public static final String RELATIVE_PATH_SIGNAL = IFileFolderConstants.DOT
- + IFileFolderConstants.DOT + IFileFolderConstants.PATH_SEPARATOR;
-
- /**
- * adjust relative path isside the absolute path
- */
- public static String adjustPath(String path) {
- int i = 0;
- while ((i = path.indexOf(RELATIVE_PATH_SIGNAL)) > 0) {
- // split the string into two
- String part1 = path.substring(0, i - 1);
- String part2 = path
- .substring(i + RELATIVE_PATH_SIGNAL.length() - 1);
- // strip one path seg from part1
- int j = part1.lastIndexOf(FORWARD_SLASH);
- if (j == -1) {
- return "";//$NON-NLS-1$
- }
- part1 = part1.substring(0, j);
- path = part1 + part2;
- }
- return path;
- }
-
- /**
- * Append trailing url slash if needed
- */
- public static String appendTrailingURLSlash(String input) {
- // check to see already a slash
- if (!input.endsWith(FORWARD_SLASH)) {
- input += FORWARD_SLASH;
- }
- return input;
- }
-
- /**
- * Convert to relative url based on base
- */
- public static String convertToRelativePath(String input, String base) {
- // tokenize the strings
- StringTokenizer inputTokenizer = new StringTokenizer(input,
- FORWARD_SLASH);
- StringTokenizer baseTokenizer = new StringTokenizer(base, FORWARD_SLASH);
- String token1 = "", token2 = "";//$NON-NLS-2$//$NON-NLS-1$
- //
- // Go through until equls
- while (true) {
- if (!inputTokenizer.hasMoreTokens()
- || !baseTokenizer.hasMoreTokens()) {
- break;
- }
- token1 = baseTokenizer.nextToken();
- token2 = inputTokenizer.nextToken();
- if (!token1.equals(token2)) {
- break;
- }
- }
- // now generate the backs
- String output = "";//$NON-NLS-1$
- while (baseTokenizer.hasMoreTokens()) {
- baseTokenizer.nextToken();
- output += RELATIVE_PATH_SIGNAL;
- }
- output += token2;
- // generate the rest
- while (inputTokenizer.hasMoreTokens()) {
- output = output + FORWARD_SLASH + inputTokenizer.nextToken();
- }
- return output;
- }
-
- public static String convertToWebPath(String projectName, String path) {
- String name = "";
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
- String webrootName = WebrootUtil.getWebContentFolder(project).getName();
-
- if (path.indexOf(webrootName) != -1) {
- name = projectName + IFileFolderConstants.PATH_SEPARATOR
- + webrootName;
- } else {
- name = projectName;
- }
- int index = path.indexOf(projectName);
-
- return path.substring(index + name.length());
- }
-
- /**
- * convert path relative to current active file to absolute path in
- * filesystem
- *
- * @param uri
- * the relative path
- * @return absolute path in file system
- */
- public static String convertToAbsolutePath(String uri, IFile curFile) {
- if (uri == null || uri.trim().equals("")) {
- return uri;
- }
- String webroot = "";
- IFile jsp = curFile;
- try {
- if (jsp == null) {
- jsp = ((IFileEditorInput) JSFUICommonPlugin.getActivePage()
- .getActiveEditor().getEditorInput()).getFile();
- }
- if (jsp != null) {
- String webrootName = WebrootUtil.getWebContentFolder(
- jsp.getProject()).getName();
- webroot = jsp.getProject().getFolder(webrootName).getLocation()
- .toString();
- }
- } catch (NullPointerException e) {
- return uri;
- }
- if (uri.startsWith(IFileFolderConstants.PATH_SEPARATOR)) //$NON-NLS-1$
- {
- return webroot + uri;
- }
- if (jsp != null) {
- IContainer con = jsp.getParent();
- if (con != null) {
- IPath path = con.getLocation();
- if (path != null) {
- String aPath = path.toString() + File.separator + uri;
- aPath = aPath.replace('/', File.separatorChar);
- aPath = aPath.replace('\\', File.separatorChar);
- if (aPath.endsWith(File.separator)) {
- aPath += IFileFolderConstants.PATH_SEPARATOR;
- }
- File file = new File(aPath);
- if (file.exists() && file.isFile()) {
- return file.getAbsolutePath();
- }
- return uri;
- }
- }
- }
- return uri;
- }
-
- /**
- * @param javaProject
- * @param parent
- * @return the IPath for a a classpath object (?)
- */
- public static IPath getPathOnClasspath(IJavaProject javaProject,
- Object parent) {
- IPath result = null;
- if (javaProject == null || parent == null) {
- return new Path("");
- }
- IClasspathEntry[] entries = javaProject.readRawClasspath();
- IPath classPath = null;
- if (parent instanceof IResource) {
- if (((javaProject != null) && !javaProject
- .isOnClasspath((IResource) parent))) {
- return new Path("");
- }
- if (parent instanceof IFile) {
- IPath elementPath = ((IFile) parent).getFullPath();
- if (((IFile) parent).getFileExtension().equalsIgnoreCase(
- IFileFolderConstants.EXT_PROPERTIES)) {
- int machings = 0;
- try {
- for (int i = 0; i < entries.length; i++) {
- // Determine whether on this classentry's path
- int n = entries[i].getPath().matchingFirstSegments(
- elementPath);
- if (n > machings) {
- // Get package name
- machings = n;
- classPath = elementPath.removeFirstSegments(
- machings).removeLastSegments(1);
- }
- }
-
- // Not on the classpath?
- if (classPath == null) {
- return null;
- } else if (classPath.segmentCount() > 0) {
- IJavaElement element = javaProject
- .findElement(classPath);
- if (element != null) {
- IPath path = element.getPath();
- if (path != null) {
- IPath path1 = path
- .removeFirstSegments(machings);
-
- String fileName = ((IFile) parent)
- .getName();
- if (fileName != null) {
- result = path1.append(fileName);
- }
- }
- }
-
- } else {
- result = ((IFile) parent).getFullPath()
- .removeFirstSegments(machings);
- }
- } catch (Exception e) {
- return null;
- }
- }
- }
- } else if (parent instanceof JarEntryFile) {
- IPath elementPath = ((JarEntryFile) parent).getFullPath();
- if (elementPath.getFileExtension().equalsIgnoreCase(
- IFileFolderConstants.EXT_PROPERTIES)) {
- result = elementPath;
- }
- }
- if (result != null) {
- return result;
- }
- return new Path("");
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java
deleted file mode 100644
index 8ebcd0354..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author mengbo
- */
-public class PluginImageHelper {
- private static PluginImageHelper _instance = null;
-
- /**
- * Gets the instance.
- *
- * @return Returns a TaglibPluginImageHelper
- */
- public synchronized static PluginImageHelper getInstance() {
- if (_instance == null) {
- _instance = new PluginImageHelper();
- }
- return _instance;
- }
-
- // save a descriptor for each image
- private HashMap _imageDescRegistry = null;
-
- private final String PLUGIN_SEPARATOR = "^"; //$NON-NLS-1$
-
- /**
- * Creates an image from the given resource and adds the image to the image
- * registry.
- *
- * @param resource
- * @param pluginId
- * @return Image
- */
- private Image createImage(String resource, String pluginId) {
- ImageDescriptor desc = getImageDescriptor(resource, pluginId);
- Image image = null;
-
- if (desc != null) {
- image = desc.createImage();
-
- // dont add the missing image descriptor image to the image
- // registry
- if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) {
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
- String key = thePluginId + PLUGIN_SEPARATOR + resource;
- getImageRegistry().put(key, image);
- }
- }
- return image;
- }
-
- /**
- * Creates an image descriptor from the given imageFilePath in the given
- * pluginId and adds the image descriptor to the image descriptor registry.
- * If an image descriptor could not be created, the default "missing" image
- * descriptor is returned but not added to the image descriptor registry.
- *
- * @param imageFilePath
- * @param pluginId
- * if null, look in this plugin
- * @return ImageDescriptor image descriptor for imageFilePath or default
- * "missing" image descriptor if resource could not be found
- */
- private ImageDescriptor createImageDescriptor(String imageFilePath,
- String pluginId) {
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
-
- ImageDescriptor imageDescriptor = AbstractUIPlugin
- .imageDescriptorFromPlugin(thePluginId, imageFilePath);
- if (imageDescriptor != null) {
- String key = thePluginId + PLUGIN_SEPARATOR + imageFilePath;
- getImageDescriptorRegistry().put(key, imageDescriptor);
- } else {
- imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
- }
-
- return imageDescriptor;
- }
-
- /**
- * Retrieves the image associated with resource from the image registry. If
- * the image cannot be retrieved, attempt to find and load the image at the
- * location specified in resource.
- *
- * @param resource
- * the image to retrieve
- * @return Image the image associated with resource or null if one could not
- * be found
- */
- public Image getImage(String resource) {
- return getImage(resource, null);
- }
-
- /**
- * Retrieves the image associated with resource from the image registry. If
- * the image cannot be retrieved, attempt to find and load the image at the
- * location specified in resource.
- *
- * @param resource
- * the image to retrieve
- * @param pluginId
- * @return Image the image associated with resource or null if one could not
- * be found
- */
- public Image getImage(String resource, String pluginId) {
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
-
- String key = thePluginId + PLUGIN_SEPARATOR + resource;
-
- Image image = getImageRegistry().get(key);
- if (image == null) {
- // create an image
- image = createImage(resource, pluginId);
- }
- return image;
- }
-
- /**
- * Retrieves the image descriptor associated with resource from the image
- * descriptor registry. If the image descriptor cannot be retrieved, attempt
- * to find and load the image descriptor at the location specified in
- * resource.
- *
- * @param resource
- * the image descriptor to retrieve
- * @return ImageDescriptor the image descriptor assocated with resource or
- * the default "missing" image descriptor if one could not be found
- */
- public ImageDescriptor getImageDescriptor(String resource) {
- return getImageDescriptor(resource, null);
- }
-
- /**
- * Retrieves the image descriptor associated with resource in pluginId from
- * the image descriptor registry. If the image descriptor cannot be
- * retrieved, attempt to find and load the image descriptor at the location
- * specified in resource in pluginId.
- *
- * @param resource
- * the image descriptor to retrieve
- * @param pluginId
- * the plugin the resource is located. if null, use look in this
- * plugin
- * @return ImageDescriptor the image descriptor assocated with resource or
- * the default "missing" image descriptor if one could not be found
- */
- public ImageDescriptor getImageDescriptor(String resource, String pluginId) {
- ImageDescriptor imageDescriptor = null;
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
-
- String key = thePluginId + PLUGIN_SEPARATOR + resource;
- Object o = getImageDescriptorRegistry().get(key);
- if (o == null) {
- // create a descriptor
- imageDescriptor = createImageDescriptor(resource, pluginId);
- } else {
- imageDescriptor = (ImageDescriptor) o;
- }
- return imageDescriptor;
- }
-
- /**
- * Returns the image descriptor registry for this plugin.
- *
- * @return HashMap - image descriptor registry for this plugin
- */
- private HashMap getImageDescriptorRegistry() {
- if (_imageDescRegistry == null) {
- _imageDescRegistry = new HashMap();
- }
- return _imageDescRegistry;
- }
-
- /**
- * Returns the image registry for this plugin.
- *
- * @return ImageRegistry - image registry for this plugin
- */
- private ImageRegistry getImageRegistry() {
- return JFaceResources.getImageRegistry();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java
deleted file mode 100644
index 02a6261f9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java
+++ /dev/null
@@ -1,576 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-
-/**
- * The main purpose of this class is to give better access methods for property
- * and resource bundle access.
- *
- * @author mengbo
- */
-public class PropertyUtils {
- // WARNING: There can be NO static logging line here since the logger uses
- // this class to figure out the preferences
- // for the logging system. "Logging" an error here would be useless since
- // you might be setting up the logging system
- // via a call to PropertyUtils.getServerProperty() instead it uses
- // "System.err.println".
-
- // This is the name for the properties file.
- // The prop-name will be prepended to this string....
- private static final String NAME_PROPERTIES = ".props";
-
- public static final String STR_BOUNDS_END = ".bounds"; // assumes the
-
- // window name or
- // name list is
- // prepended
-
- // //////////////////////////////////////////////////////////////////////////
- // Property get methods.
- // //////////////////////////////////////////////////////////////////////////
- public static String getProperty(Properties props, String key,
- String theDefault) {
- try {
- String value = props.getProperty(key, theDefault);
- if ((value != null) && (value.length() == 0)) {
- value = null;
- }
- // check again for null, since some versions of the jdk ignore the
- // default
- // if an empty property exists.
- if (value == null) {
- value = theDefault;
- }
- return value;
- } catch (Exception ee) {
- return theDefault;
- }
- }
-
- public static String getProperty(Properties props, String key) {
- try {
- String value = props.getProperty(key);
- if ((value != null) && (value.length() == 0)) {
- value = null;
- }
- return value;
- } catch (Exception ee) {
- return null;
- }
- }
-
- public static int getPropertyValue(Properties props, String key,
- int defaultValue, int minumumValue) {
- int theValue = getPropertyValue(props, key, defaultValue);
-
- if (theValue < minumumValue) {
- theValue = minumumValue;
- }
- return theValue;
- }
-
- public static int getPropertyValue(Properties props, String key,
- int defaultValue) {
- String stringValue = getProperty(props, key);
- if (stringValue != null) {
- try {
- return Integer.parseInt(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- public static long getPropertyLongValue(Properties props, String key,
- long defaultValue) {
- String stringValue = getProperty(props, key);
- if (stringValue != null) {
- try {
- return Long.parseLong(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- public static boolean isProperty(Properties props, String key,
- boolean bDefault) {
- return getProperty(props, key, "" + bDefault).equals("" + true);
- }
-
- public static String[] getPropertyStrings(Properties props, String key) {
- String tokenString = getProperty(props, key);
-
- if (tokenString == null) {
- return new String[0];
- }
- StringTokenizer tokenizer = new StringTokenizer(tokenString, ",");
- String[] pNames = new String[tokenizer.countTokens()];
-
- for (int ii = 0; ii < pNames.length; ii++) {
- pNames[ii] = ((String) tokenizer.nextElement()).trim();
- }
- return pNames;
- }
-
- // //////////////////////////////////////////////////////////////////////////
- // Resource bundle get methods.
- // //////////////////////////////////////////////////////////////////////////
- public static String getResourceProperty(ResourceBundle bundle, String key,
- String theDefault) {
- try {
- String value = bundle.getString(key);
- if ((value == null) || (value.length() == 0)) {
- value = theDefault;
- }
- return value;
- } catch (Exception ee) {
- return theDefault;
- }
- }
-
- public static String getResourceProperty(ResourceBundle bundle, String key) {
- try {
- String value = bundle.getString(key);
- if ((value != null) && (value.length() == 0)) {
- value = null;
- }
- return value;
- } catch (Exception ee) {
- return null;
- }
- }
-
- public static int getResourcePropertyValue(ResourceBundle bundle,
- String key, int defaultValue, int minumumValue) {
- int theValue = getResourcePropertyValue(bundle, key, defaultValue);
-
- if (theValue < minumumValue) {
- theValue = minumumValue;
- }
- return theValue;
- }
-
- public static int getResourcePropertyValue(ResourceBundle bundle,
- String key, int defaultValue) {
- String stringValue = getResourceProperty(bundle, key);
- if (stringValue != null) {
- try {
- return Integer.parseInt(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- public static long getResourcePropertyLongValue(ResourceBundle bundle,
- String key, long defaultValue) {
- String stringValue = getResourceProperty(bundle, key);
- if (stringValue != null) {
- try {
- return Long.parseLong(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- public static boolean isResourceProperty(ResourceBundle bundle, String key,
- boolean bDefault) {
- return getResourceProperty(bundle, key, "" + bDefault)
- .equals("" + true);
- }
-
- // ///////////////////////////////////////////////////////////////////////
- // Property misc routines
- // ///////////////////////////////////////////////////////////////////////
- public static String encodeName(String theName) {
- int theSize = theName.length();
- StringBuffer encoded = new StringBuffer(theSize);
- char ch;
-
- for (int ii = 0; ii < theSize; ii++) {
- ch = theName.charAt(ii);
- switch (ch) {
- // these are the set of illegal characters in a Property name
- case '=': // %3d
- encoded.append("%3d");
- break;
- case ':': // %3a
- encoded.append("%3a");
- break;
- case ' ': // %20
- encoded.append("%20");
- break;
- case '\n': // %0a
- encoded.append("%0a");
- break;
- case '\t': // %09
- encoded.append("%09");
- break;
- case '\r': // %0d
- encoded.append("%0d");
- break;
- case '%': // %25
- // added because its our encoding flag
- encoded.append("%25");
- break;
- default:
- encoded.append(ch);
- break;
- }
- }
-
- return encoded.toString();
- }
-
- public static String decodeName(String theName) {
- int theSize = theName.length();
- int kk;
- StringBuffer decoded = new StringBuffer(theSize);
- char ch;
-
- for (int ii = 0; ii < theSize; ii++) {
- ch = theName.charAt(ii);
- if (ch == '%') {
- ch = theName.charAt(++ii);
- kk = Character.digit(ch, 16);
- kk *= 16;
- ch = theName.charAt(++ii);
- kk += Character.digit(ch, 16);
- decoded.append((char) kk);
- } else {
- decoded.append(ch);
- }
- }
-
- return decoded.toString();
- }
-
- public static Properties openProperties(String propName)
- throws IOException, FileNotFoundException {
- return openProperties(propName, null, true);
- }
-
- public static Properties openProperties(String propName,
- Properties propDefaults) throws IOException, FileNotFoundException {
- return openProperties(propName, propDefaults, true);
- }
-
- public static Properties openProperties(String propName,
- Properties propDefaults, boolean bCreatePropertiesPathname)
- throws IOException, FileNotFoundException {
- Properties theProperties = new Properties(propDefaults);
-
- try {
- String propertiesFilename = bCreatePropertiesPathname ? getPropertiesPathname(propName)
- : propName;
- InputStream theStream = new FileInputStream(propertiesFilename);
- theProperties.load(theStream);
- theStream.close();
- } catch (FileNotFoundException ee) {
- if (propDefaults == null) {
- throw ee;
- }
- } catch (IOException ee) {
- if (propDefaults == null) {
- throw ee;
- }
- }
-
- return theProperties;
- }
-
- /*
- * * Combines two properties objects, with the second one as the default
- * properties
- */
- public static Properties combineProperties(Properties localProperties,
- Properties defaultProperties) throws IOException {
- Properties theNewProperties = new Properties();
-
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- defaultProperties.store(os, "");
- localProperties.store(os, "");
- byte[] theData = os.toByteArray();
- ByteArrayInputStream is = new ByteArrayInputStream(theData);
- theNewProperties.load(is);
-
- return theNewProperties;
- }
-
- // This should only be called by the main interface on shutdown/close!!!
- public static void saveProperties(String propName, Properties theProperties)
- throws IOException, SecurityException {
- saveProperties(propName, theProperties, true);
- }
-
- public static void saveProperties(String propName,
- Properties theProperties, boolean bCreatePropertiesPathname)
- throws IOException, SecurityException {
- // write out the changed set of preferences...
- String propertiesFilename = bCreatePropertiesPathname ? getPropertiesPathname(propName)
- : propName;
- FileOutputStream fout = new FileOutputStream(propertiesFilename);
- theProperties.store(fout, "preferences");
- fout.close();
- }
-
- public static String encodeFilename(String theFilename) {
- // make theFilename legal on the local system....
- String theSeparator = System.getProperty("file.separator");
- // replace all occurrances of the file separator with a ' '
- for (int ii = 0; ii < theSeparator.length(); ii++) {
- char theChar = theSeparator.charAt(ii);
- theFilename = theFilename.replace(theChar, ' ');
- }
-
- return theFilename;
- }
-
- public static String getPropertiesPathname(String baseName) {
- if (baseName.endsWith(NAME_PROPERTIES)) {
- return System.getProperty("user.dir")
- + System.getProperty("file.separator")
- + encodeFilename(baseName);
- }
- return System.getProperty("user.dir")
- + System.getProperty("file.separator")
- + encodeFilename(baseName) + NAME_PROPERTIES;
- }
-
- // /////////////////////////////////////////////////////////////////////////
- // These are generic routines that are used to get/set/save window bounds
-
- private static final int INSET = 40;
-
- /**
- * Set the initial bounds (size & location) of a component. This will get
- * the location from the preferences file based on the values of the "names"
- * parameter. These values will be encoded to make a legal properties name,
- * joined togther with ".", and the value STR_BOUNDS_END will be appended.
- * The resulting name will be used to obtain the intial bounds value from
- * the properties file, which will be decoded and the specified component
- * will then be set to that value.
- */
- public static void setComponentBounds(Properties props,
- Component theComponent, String names[], String defaultValue) {
- setComponentBounds(props, theComponent, names, defaultValue, false);
- }
-
- public static void setComponentBounds(Properties props,
- Component theComponent, String names[], String defaultValue,
- boolean bEnsureDesktopVisibility) {
- String tmpString = getComponentPropertyName(names, STR_BOUNDS_END);
- setComponentBounds(props, theComponent, tmpString, defaultValue,
- bEnsureDesktopVisibility);
- }
-
- public static void setComponentBounds(Properties props,
- Component theComponent, String thePropertyName, String defaultValue) {
- setComponentBounds(props, theComponent, thePropertyName, defaultValue,
- false);
- }
-
- public static void setComponentBounds(Properties props,
- Component theComponent, String thePropertyName,
- String defaultValue, boolean bEnsureDesktopVisibility) {
- String tmpString = props.getProperty(thePropertyName, defaultValue);
- Rectangle theValue = decodeBounds(tmpString);
- theComponent.setBounds(theValue);
- if (bEnsureDesktopVisibility) {
- // make sure that this component is visible on the desktop...
- // verify that this window is visible...
- Point theLoc = theComponent.getLocation();
- // get width/height of desktop....
- Dimension portSize = new Dimension(Toolkit.getDefaultToolkit()
- .getScreenSize());
- if (theLoc.x > portSize.width) // move it to top
- theLoc.x = INSET;
- if (theLoc.y > portSize.height) // move it to left
- theLoc.y = INSET;
- theComponent.setLocation(theLoc);
- }
- }
-
- public static void saveComponentBounds(Properties props,
- Component theComponent, String names[]) {
- String tmpString = getComponentPropertyName(names, STR_BOUNDS_END);
- saveComponentBounds(props, theComponent, tmpString);
- }
-
- public static void saveComponentBounds(Properties props,
- Component theComponent, String thePropertyName) {
- Rectangle theBounds = theComponent.getBounds();
- String theValue = encodeBounds(theBounds);
- props.put(thePropertyName, theValue);
- }
-
- public static String getComponentPropertyName(String names[],
- String subsystemName) {
- String tmpString = "";
-
- for (int ii = 0; ii < names.length; ii++) {
- tmpString = tmpString + (ii > 0 ? "." : "")
- + PropertyUtils.encodeName(names[ii]);
- }
- if (subsystemName.startsWith(".") == false)
- tmpString += ".";
- tmpString = tmpString + subsystemName;
- return tmpString;
- }
-
- /**
- * Decode the comma separated values stored in sBounds. This method is
- * normally called to decode the location/size of a component which has been
- * saved into a Properties object. See encodeBounds(); Order of items in the
- * string is (x, y, w, h)
- */
- public static Rectangle decodeBounds(String sBounds) {
- int index;
- int ii;
- int theValue[] = new int[4];
- String tmpString;
- String restString = sBounds;
-
- for (ii = 0; ii < 4; ii++) {
- theValue[ii] = 0;
- }
- try {
- for (ii = 0; ii < 4; ii++) {
- index = restString.indexOf(",");
- if (index > 0) {
- tmpString = restString.substring(0, index);
- restString = restString.substring(index + 1);
- } else {
- tmpString = restString; // should only happen on the last
- // one....
- restString = null; // will cause an exception if not last
- // one...
- }
- theValue[ii] = Integer.valueOf(tmpString).intValue();
- }
- } catch (Exception ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should show
- // these to user.
- }
-
- return new Rectangle(theValue[0], theValue[1], theValue[2], theValue[3]);
- }
-
- /**
- * * Encode the bounds of a component into a comma separated list * that is
- * appropriate for storing in a Properties object. * See decodeBounds();
- */
- public static String encodeBounds(Rectangle rBounds) {
- return "" + rBounds.x + "," + rBounds.y + "," + rBounds.width + ","
- + rBounds.height;
- }
-
- /**
- * Methods for creating Properties objects from strings.
- *
- * Then "Encoded" versions are used on values that are stored into a
- * properties file (think of them as sub-properties). They do the encoding
- * necessary to turn a properties object into a string that has legal
- * "value" syntax (they actually do more than they need to, but its all
- * non-destructive).
- */
- public static Properties getPropertiesFromString(String thePropertyString)
- throws IOException {
- if (thePropertyString == null)
- return null;
- ByteArrayInputStream in = new ByteArrayInputStream(thePropertyString
- .getBytes());
-
- Properties props = new Properties();
- props.load(in); // throws IOException
- in = null;
- return props;
- }
-
- public static Properties getPropertiesFromEncodedString(
- String theEncodedPropertyString) throws IOException {
- if (theEncodedPropertyString == null)
- return null;
- return (getPropertiesFromString(decodeName(theEncodedPropertyString)));
- }
-
- public static Properties encodedStringToProperties(
- String theEncodedPropertyString) {
- try {
- return getPropertiesFromEncodedString(theEncodedPropertyString);
- } catch (IOException ee) {
- return null;
- }
- }
-
- public static String savePropertiesToString(Properties props, String comment)
- throws IOException {
- if (props == null)
- return null;
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- props.store(out, comment);
- String tmpString = out.toString();
- out = null;
- return tmpString;
- }
-
- public static String savePropertiesToEncodedString(Properties props,
- String comment) throws IOException {
- if (props == null)
- return null;
- return encodeName(savePropertiesToString(props, comment));
- }
-
- public static String propertiesToEncodedString(Properties props) {
- try {
- return savePropertiesToEncodedString(props, "");
- } catch (IOException ee)// NOPMD
- {
- JSFUICommonPlugin.getLogger(PropertyUtils.class).error("saving properties", ee);
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java
deleted file mode 100644
index 07bdff727..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-
-/**
- * Give easy access to a resource bundle.
- *
- * @author mengbo
- */
-public abstract class ResourceUtils {
- private static Logger _log = JSFUICommonPlugin.getLogger(ResourceUtils.class);
-
- // This is the resource bundle.
- protected ResourceBundle _resources;
-
- /**
- * Empty Constructor.
- */
- protected ResourceUtils() {
- // restrict instantiation
- }
-
- /**
- * Easy way to set the bundle and get a fatal log messages and an alert if
- * the resource bundle is not found.
- *
- * @param resource
- * @param bundleLocation
- */
- protected void setBundle(ResourceBundle resource, String bundleLocation) {
- _resources = resource;
- if (_resources == null) {
- // log.ResourceUtils=Missing Resource Bundle "{0}".
- _log.error("log.ResourceUtils", bundleLocation);
- // pluginName=Web Application Development Common
- JSFUICommonPlugin.getAlerts().error("pluginName", "log.ResourceUtils",
- bundleLocation);
- }
- }
-
- /**
- * Get the static stored resource bundle for the TRP.
- */
- public ResourceBundle getResourceBundle() {
- return _resources;
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. This
- * property should be an integer. If none is defined
- * (MissingResourceException), return the default.
- *
- * @param key
- * the key in the resource bundle.
- * @param defaultValue
- * default int to return if no value is found for the key.
- */
- public int getValue(String key, int defaultValue) {
- String stringValue = getString(key);
- if (stringValue != null) {
- try {
- return Integer.parseInt(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. This
- * property should be an long. If none is defined
- * (MissingResourceException), return the default.
- *
- * @param key
- * the key in the resource bundle.
- * @param defaultValue
- * default long to return if no value is found for the key.
- */
- public long getValue(String key, long defaultValue) {
- String stringValue = getString(key);
- if (stringValue != null) {
- try {
- return Long.parseLong(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. This
- * property should be boolean ("true" of "false"). If none is defined
- * (MissingResourceException), return the default.
- *
- * @param key
- * the key in the resource bundle.
- */
- public boolean isResource(String key) {
- return getString(key).equals("" + true);
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. If
- * none is defined (MissingResourceException), return null.
- *
- * @param key
- * the key in the resource bundle.
- */
- public String getString(String key) {
- try {
- return _resources.getString(key);
- } catch (MissingResourceException ee) {
- return key;
- }
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1) {
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @param arg2
- * the third argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1, Object arg2) {
- Object[] args = new Object[3];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @param arg2
- * the third argument.
- * @param arg3
- * the forth argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1, Object arg2,
- Object arg3) {
- Object[] args = new Object[4];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
- args[3] = arg3;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @param arg2
- * the third argument.
- * @param arg3
- * the forth argument.
- * @param arg4
- * the forth argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1, Object arg2,
- Object arg3, Object arg4) {
- Object[] args = new Object[5];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
- args[3] = arg3;
- args[4] = arg4;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param args
- * an array of arguments
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object[] args) {
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- public static void ensureClosed(InputStream inputStream) {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException e) {
- // Ignore
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java
deleted file mode 100644
index a55677216..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.util.regex.Pattern;
-
-/**
- * This is tool class for String processing.
- *
- * @author mengbo
- */
-public class StringUtil {
-
- // pattern to find all end-of-paragraph and end-of-line html tags
- // so they can be converted to newlines
- final private static Pattern htmlToNewline = Pattern.compile("</p>|<br>");
-
- // pattern to strip all <x> and </x> HTML tags
- final private static Pattern removeHTMLTags = Pattern.compile("<[/?\\w\\s=\"\\.\\#]+>");
-
- // pattern to find all runs of spaces longer than one
- final private static Pattern trimInteriorWhitespace = Pattern.compile("[ ]+");
-
- /**
- * Split a java variable name into words For example, "_aJavaVariable" will
- * split to "A Java Variable", "_aWTPPackageImplementation" will be "A WTP
- * Package Implementation"
- *
- * @param variable
- * @return String
- */
- public static String splitVariable(String variable) {
- StringBuffer output = new StringBuffer("");
- boolean isCapitalLeading = false;
- boolean isLastSpace = false;
-
- for (int i = 0, n = variable.length(); i < n; i++) {
- char letter = variable.charAt(i);
-
- if (letter == '_' || letter == '$') {
- output.append(" ");
- isCapitalLeading = false;
- isLastSpace = true;
- continue;
- }
-
- if (Character.isLowerCase(letter)) {
- int nextIndex = i + 1;
- if (nextIndex < n) {
- char nextLetter = variable.charAt(nextIndex);
- if (Character.isUpperCase(nextLetter)) {
- if (isCapitalLeading) {
- output.append(letter);
- isLastSpace = false;
- } else {
- output.append(Character.toUpperCase(letter));
- isLastSpace = false;
- }
- if (!isLastSpace) {
- output.append(' ');
- isLastSpace = true;
- }
- isCapitalLeading = false;
- continue;
- }
- }
- }
- if (Character.isUpperCase(letter)) {
- int nextIndex = i + 1;
- if (nextIndex < n) {
- char nextLetter = variable.charAt(nextIndex);
- if (Character.isLowerCase(nextLetter)) {
- if (!isLastSpace) {
- output.append(' ');
- isLastSpace = true;
- }
- output.append(letter);
- isCapitalLeading = true;
- isLastSpace = false;
- continue;
- }
- }
- }
- if (isCapitalLeading) {
- output.append(letter);
- isLastSpace = false;
- } else {
- output.append(Character.toUpperCase(letter));
- isCapitalLeading = true;
- isLastSpace = false;
- }
- }
-
- return output.toString().trim();
- }
-
- /**
- * @param str1
- * @param str2
- * @return boolean
- *
- * Check if two strings match or not if str1=null and str2=null, it will
- * return true
- */
- public static boolean isSameString(String str1, String str2) {
- if (str1 == null) {
- return str2 == null;
- }
- return str1.equals(str2);
- }
-
- /**
- *
- * @param text
- * @return String Filter and convert a string, or normalize a string For
- * example,
- * <p>
- * test
- * </p>
- * test1<a/> will be converted to: test\ntest1
- *
- */
- public static String filterConvertString(String text) {
- if (text == null) {
- return "";
- }
-
- String result = htmlToNewline.matcher(text).replaceAll("\n");
- result = removeHTMLTags.matcher(result).replaceAll("");
- result = trimInteriorWhitespace.matcher(result).replaceAll(" ");
-
- return result;
- }
-
- /**
- * Determine whether a string is empty or not Example: null string -> return
- * true; Example: "" string -> return true; Otherwise, will return false;
- * @param str
- *
- * @return true if str is null or empty
- */
- public static boolean isEmptyString(String str) {
- if (str == null || str.length() == 0) {
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java
deleted file mode 100644
index bbcf2ce3c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java
+++ /dev/null
@@ -1,1878 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.util.Arrays;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.accessibility.AccessibleTextAdapter;
-import org.eclipse.swt.accessibility.AccessibleTextEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Listener;
-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.eclipse.swt.widgets.TypedListener;
-
-/**
- * The CCombo class represents a selectable user interface object that combines
- * a text field and a list and issues notification when an item is selected from
- * the list.
- * <p>
- * Note that although this class is a subclass of <code>Composite</code>, it
- * does not make sense to add children to it, or set a layout on it.
- * </p>
- * <dl>
- * <dt><b>Styles:</b>
- * <dd>BORDER, READ_ONLY, FLAT</dd>
- * <dt><b>Events:</b>
- * <dd>Selection</dd>
- * </dl>
- */
-public final class StyleCombo extends Composite {
-
- Text text;
-
- Table table;
-
- int visibleItemCount = 4;
-
- Shell popup;
-
- Button arrow;
-
- boolean hasFocus;
-
- Listener listener, filter;
-
- Color foreground, background;
-
- Font font;
-
- String defaultValue;
-
- /**
- * Constructs a new instance of this class given its parent and a style
- * value describing its behavior and appearance.
- * <p>
- * The style value is either one of the style constants defined in class
- * <code>SWT</code> which is applicable to instances of this class, or
- * must be built by <em>bitwise OR</em>'ing together (that is, using the
- * <code>int</code> "|" operator) two or more of those <code>SWT</code>
- * style constants. The class description lists the style constants that are
- * applicable to the class. Style bits are also inherited from superclasses.
- * </p>
- *
- * @param parent
- * a widget which will be the parent of the new instance (cannot
- * be null)
- * @param style
- * the style of widget to construct
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the parent</li>
- * </ul>
- *
- * @see SWT#BORDER
- * @see SWT#READ_ONLY
- * @see SWT#FLAT
- */
- public StyleCombo(Composite parent, int style) {
- super(parent, style = checkStyle(style));
-
- listener = new Listener() {
- public void handleEvent(Event event) {
- if (popup == event.widget) {
- popupEvent(event);
- return;
- }
- if (text == event.widget) {
- textEvent(event);
- return;
- }
- if (table == event.widget) {
- tableEvent(event);
- return;
- }
- if (arrow == event.widget) {
- arrowEvent(event);
- return;
- }
- if (StyleCombo.this == event.widget) {
- comboEvent(event);
- return;
- }
- if (getShell() == event.widget) {
- handleFocus(SWT.FocusOut);
- }
- }
- };
-
- filter = new Listener() {
- public void handleEvent(Event event) {
- Shell shell = ((Control) event.widget).getShell();
- if (shell == StyleCombo.this.getShell()) {
- handleFocus(SWT.FocusOut);
- }
- }
- };
-
- int[] comboEvents = { SWT.Dispose, SWT.Move, SWT.Resize };
- for (int i = 0; i < comboEvents.length; i++)
- this.addListener(comboEvents[i], listener);
-
- createText(style);
- createArrow(style);
-
- createPopup(null, -1);
- initAccessible();
- }
-
- /**
- * @param style
- */
- private void createArrow(int style) {
- int arrowStyle = SWT.ARROW | SWT.DOWN;
- if ((style & SWT.FLAT) != 0) {
- arrowStyle |= SWT.FLAT;
- }
- arrow = new Button(this, arrowStyle);
- int[] arrowEvents = { SWT.Selection, SWT.FocusIn };
- for (int i = 0; i < arrowEvents.length; i++) {
- arrow.addListener(arrowEvents[i], listener);
- }
- }
-
- /**
- * @param style
- */
- private void createText(int style) {
- int textStyle = SWT.SINGLE;
- if ((style & SWT.READ_ONLY) != 0) {
- textStyle |= SWT.READ_ONLY;
- }
- if ((style & SWT.FLAT) != 0) {
- textStyle |= SWT.FLAT;
- }
- text = new Text(this, textStyle);
- int[] textEvents = { SWT.KeyDown, SWT.KeyUp, SWT.Modify, SWT.MouseDown,
- SWT.MouseUp, SWT.Traverse, SWT.FocusIn };
- for (int i = 0; i < textEvents.length; i++) {
- text.addListener(textEvents[i], listener);
- }
- }
-
- static int checkStyle(int style) {
- int mask = SWT.BORDER | SWT.READ_ONLY | SWT.FLAT | SWT.LEFT_TO_RIGHT
- | SWT.RIGHT_TO_LEFT;
- return style & mask;
- }
-
- /**
- * Adds the argument to the end of the receiver's list.
- *
- * @param string
- * the new item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #add(String,int)
- */
- public void add(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TableItem item = new TableItem(table, SWT.NONE);
- item.setText(0, string);
- }
-
- /**
- * Adds the argument to the receiver's list at the given zero-relative
- * index.
- * <p>
- * Note: To add an item at the end of the list, use the result of calling
- * <code>getItemCount()</code> as the index or use
- * <code>add(String)</code>.
- * </p>
- *
- * @param string
- * the new item
- * @param index
- * the index for the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #add(String)
- */
- public void add(String string, int index) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TableItem item = new TableItem(table, SWT.NONE, index);
- item.setText(0, string);
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notified
- * when the receiver's text is modified, by sending it one of the messages
- * defined in the <code>ModifyListener</code> interface.
- *
- * @param listener1
- * the listener which should be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see ModifyListener
- * @see #removeModifyListener
- */
- public void addModifyListener(ModifyListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TypedListener typedListener = new TypedListener(listener1);
- addListener(SWT.Modify, typedListener);
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notified
- * when the receiver's selection changes, by sending it one of the messages
- * defined in the <code>SelectionListener</code> interface.
- * <p>
- * <code>widgetSelected</code> is called when the combo's list selection
- * changes. <code>widgetDefaultSelected</code> is typically called when
- * ENTER is pressed the combo's text area.
- * </p>
- *
- * @param listener1
- * the listener which should be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see SelectionListener
- * @see #removeSelectionListener
- */
- public void addSelectionListener(SelectionListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TypedListener typedListener = new TypedListener(listener1);
- addListener(SWT.Selection, typedListener);
- addListener(SWT.DefaultSelection, typedListener);
- }
-
- void arrowEvent(Event event) {
- switch (event.type) {
- case SWT.FocusIn: {
- handleFocus(SWT.FocusIn);
- break;
- }
- case SWT.Selection: {
- dropDown(!isDropped());
- break;
- }
- }
- }
-
- /**
- * Sets the selection in the receiver's text field to an empty selection
- * starting just before the first character. If the text field is editable,
- * this has the effect of placing the i-beam at the start of the text.
- * <p>
- * Note: To clear the selected items in the receiver's list, use
- * <code>deselectAll()</code>.
- * </p>
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #deselectAll
- */
- public void clearSelection() {
- checkWidget();
- text.clearSelection();
- table.deselectAll();
- }
-
- void comboEvent(Event event) {
- switch (event.type) {
- case SWT.Dispose:
- if (popup != null && !popup.isDisposed()) {
- table.removeListener(SWT.Dispose, listener);
- popup.dispose();
- }
- Shell shell = getShell();
- shell.removeListener(SWT.Deactivate, listener);
- Display display = getDisplay();
- display.removeFilter(SWT.FocusIn, filter);
- popup = null;
- text = null;
- table = null;
- arrow = null;
- break;
- case SWT.Move:
- dropDown(false);
- break;
- case SWT.Resize:
- internalLayout(false);
- break;
- }
- }
-
- private String[] getTableItems() {
- TableItem[] items = table.getItems();
- String[] values = new String[items.length];
- for (int i = 0; i < items.length; i++) {
- values[i] = items[i].getText(0);
- }
- return values;
- }
-
- public Point computeSize(int wHint, int hHint, boolean changed) {
- checkWidget();
- int width = 0, height = 0;
- String[] items = getTableItems();
- int textWidth = 0;
- GC gc = new GC(text);
- int spacer = gc.stringExtent(" ").x; //$NON-NLS-1$
- for (int i = 0; i < items.length; i++) {
- textWidth = Math.max(gc.stringExtent(items[i]).x, textWidth);
- }
- gc.dispose();
- Point textSize = text.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);
- Point arrowSize = arrow.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);
- Point listSize = table.computeSize(wHint, SWT.DEFAULT, changed);
- int borderWidth = getBorderWidth();
-
- height = Math.max(hHint, Math.max(textSize.y, arrowSize.y) + 2
- * borderWidth);
- width = Math.max(wHint, Math.max(textWidth + 2 * spacer + arrowSize.x
- + 2 * borderWidth, listSize.x));
- return new Point(width, height);
- }
-
- void createPopup(String[] items, int selectionIndex) {
- // create shell and list
- popup = new Shell(getShell(), SWT.NO_TRIM | SWT.ON_TOP);
- table = new Table(popup, SWT.SINGLE | SWT.V_SCROLL | SWT.FULL_SELECTION);
- new TableColumn(table, SWT.LEFT);
- if (font != null) {
- table.setFont(font);
- }
- if (foreground != null) {
- table.setForeground(foreground);
- }
- if (background != null) {
- table.setBackground(background);
- }
-
- int[] popupEvents = { SWT.Close, SWT.Paint, SWT.Deactivate };
- for (int i = 0; i < popupEvents.length; i++) {
- popup.addListener(popupEvents[i], listener);
- }
- int[] listEvents = { SWT.MouseUp, SWT.Selection, SWT.Traverse,
- SWT.KeyDown, SWT.KeyUp, SWT.FocusIn, SWT.FocusOut, SWT.Dispose };
- for (int i = 0; i < listEvents.length; i++) {
- table.addListener(listEvents[i], listener);
- }
- if (items != null) {
- setItems(items);
- }
- if (selectionIndex != -1) {
- select(selectionIndex);
- }
- }
-
- /**
- * Deselects the item at the given zero-relative index in the receiver's
- * list. If the item at the index was already deselected, it remains
- * deselected. Indices that are out of range are ignored.
- *
- * @param index
- * the index of the item to deselect
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void deselect(int index) {
- checkWidget();
- table.deselect(index);
- }
-
- /**
- * Deselects all selected items in the receiver's list.
- * <p>
- * Note: To clear the selection in the receiver's text field, use
- * <code>clearSelection()</code>.
- * </p>
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #clearSelection
- */
- public void deselectAll() {
- checkWidget();
- table.deselectAll();
- }
-
- void dropDown(boolean drop) {
- if (drop == isDropped()) {
- return;
- }
- if (!drop) {
- popup.setVisible(false);
- table.getColumns()[0].setWidth(0);
- if (!isDisposed() && arrow.isFocusControl()) {
- text.setFocus();
- }
- return;
- }
-
- if (getShell() != popup.getParent()) {
- String[] items = getTableItems();
- int selectionIndex = table.getSelectionIndex();
- table.removeListener(SWT.Dispose, listener);
- popup.dispose();
- popup = null;
- table = null;
- createPopup(items, selectionIndex);
- }
-
- Point size = getSize();
- int itemCount = table.getItemCount();
- itemCount = (itemCount == 0) ? visibleItemCount : Math.min(
- visibleItemCount, itemCount);
- int itemHeight = table.getItemHeight() * itemCount;
- Point tableSize = table.computeSize(SWT.DEFAULT, itemHeight, false);
- // int tableWidth = this.getClientArea()
- table.setBounds(1, 1, Math.max(size.x - 2, tableSize.x), tableSize.y
- - table.getHorizontalBar().getSize().y + 2);
-
- int index = table.getSelectionIndex();
- if (index != -1) {
- table.setTopIndex(index);
- }
- Display display = getDisplay();
- Rectangle tableRect = table.getBounds();
- Rectangle parentRect = display.map(getParent(), null, getBounds());
- Point comboSize = getSize();
- Rectangle displayRect = getMonitor().getClientArea();
- int width = Math.max(comboSize.x, tableRect.width + 2);
- int height = tableRect.height + 2;
- int x = parentRect.x;
- int y = parentRect.y + comboSize.y;
- if (y + height > displayRect.y + displayRect.height) {
- y = parentRect.y - height;
- }
- popup.setBounds(x, y, width, height);
- popup.setVisible(true);
-
- if (table.getItemCount() > visibleItemCount) {
- table.getColumns()[0].setWidth(text.getSize().x - 2);
- } else {
- table.getColumns()[0].setWidth(table.getClientArea().width);
- }
- table.setFocus();
- }
-
- /*
- * Return the Label immediately preceding the receiver in the z-order, or
- * null if none.
- */
- Label getAssociatedLabel() {
- Control[] siblings = getParent().getChildren();
- for (int i = 0; i < siblings.length; i++) {
- if (siblings[i] == StyleCombo.this) {
- if (i > 0 && siblings[i - 1] instanceof Label) {
- return (Label) siblings[i - 1];
- }
- }
- }
- return null;
- }
-
- public Control[] getChildren() {
- checkWidget();
- return new Control[0];
- }
-
- /**
- * Gets the editable state.
- *
- * @return whether or not the reciever is editable
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public boolean getEditable() {
- checkWidget();
- return text.getEditable();
- }
-
- /**
- * Returns the item at the given, zero-relative index in the receiver's
- * list. Throws an exception if the index is out of range.
- *
- * @param index
- * the index of the item to return
- * @return the item at the given index
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public String getItem(int index) {
- checkWidget();
- return table.getItem(index).getText(0);
- }
-
- /**
- * Returns the number of items contained in the receiver's list.
- *
- * @return the number of items
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getItemCount() {
- checkWidget();
- return table.getItemCount();
- }
-
- /**
- * Returns the height of the area which would be used to display
- * <em>one</em> of the items in the receiver's list.
- *
- * @return the height of one item
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getItemHeight() {
- checkWidget();
- return table.getItemHeight();
- }
-
- /**
- * Returns an array of <code>String</code>s which are the items in the
- * receiver's list.
- * <p>
- * Note: This is not the actual structure used by the receiver to maintain
- * its list of items, so modifying the array will not affect the receiver.
- * </p>
- *
- * @return the items in the receiver's list
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public String[] getItems() {
- checkWidget();
- return getTableItems();
- }
-
- char getMnemonic(String string) {
- int index = 0;
- int length = string.length();
- do {
- while ((index < length) && (string.charAt(index) != '&')) {
- index++;
- }
- if (++index >= length) {
- return '\0';
- }
- if (string.charAt(index) != '&') {
- return string.charAt(index);
- }
- index++;
- } while (index < length);
- return '\0';
- }
-
- /**
- * Returns a <code>Point</code> whose x coordinate is the start of the
- * selection in the receiver's text field, and whose y coordinate is the end
- * of the selection. The returned values are zero-relative. An "empty"
- * selection as indicated by the the x and y coordinates having the same
- * value.
- *
- * @return a point representing the selection start and end
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public Point getSelection() {
- checkWidget();
- return text.getSelection();
- }
-
- /**
- * Returns the zero-relative index of the item which is currently selected
- * in the receiver's list, or -1 if no item is selected.
- *
- * @return the index of the selected item
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getSelectionIndex() {
- checkWidget();
- return table.getSelectionIndex();
- }
-
- public int getStyle() {
- int style = super.getStyle();
- style &= ~SWT.READ_ONLY;
- if (!text.getEditable()) {
- style |= SWT.READ_ONLY;
- }
- return style;
- }
-
- /**
- * Returns a string containing a copy of the contents of the receiver's text
- * field.
- *
- * @return the receiver's text
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public String getText() {
- checkWidget();
- return text.getText();
- }
-
- /**
- * Returns the height of the receivers's text field.
- *
- * @return the text height
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getTextHeight() {
- checkWidget();
- return text.getLineHeight();
- }
-
- /**
- * Returns the maximum number of characters that the receiver's text field
- * is capable of holding. If this has not been changed by
- * <code>setTextLimit()</code>, it will be the constant
- * <code>Combo.LIMIT</code>.
- *
- * @return the text limit
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getTextLimit() {
- checkWidget();
- return text.getTextLimit();
- }
-
- /**
- * Gets the number of items that are visible in the drop down portion of the
- * receiver's list.
- *
- * @return the number of items that are visible
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public int getVisibleItemCount() {
- checkWidget();
- return visibleItemCount;
- }
-
- void handleFocus(int type) {
- if (isDisposed()) {
- return;
- }
- switch (type) {
- case SWT.FocusIn: {
- if (hasFocus) {
- return;
- }
- if (getEditable()) {
- text.selectAll();
- }
- hasFocus = true;
- Shell shell = getShell();
- shell.removeListener(SWT.Deactivate, listener);
- shell.addListener(SWT.Deactivate, listener);
- Display display = getDisplay();
- display.removeFilter(SWT.FocusIn, filter);
- display.addFilter(SWT.FocusIn, filter);
- Event e = new Event();
- notifyListeners(SWT.FocusIn, e);
- break;
- }
- case SWT.FocusOut: {
- if (!hasFocus) {
- return;
- }
- Control focusControl = getDisplay().getFocusControl();
- if (focusControl == arrow || focusControl == table
- || focusControl == text) {
- return;
- }
- hasFocus = false;
- Shell shell = getShell();
- shell.removeListener(SWT.Deactivate, listener);
- Display display = getDisplay();
- display.removeFilter(SWT.FocusIn, filter);
- Event e = new Event();
- notifyListeners(SWT.FocusOut, e);
- break;
- }
- }
- }
-
- /**
- * Searches the receiver's list starting at the first item (index 0) until
- * an item is found that is equal to the argument, and returns the index of
- * that item. If no item is found, returns -1.
- *
- * @param string
- * the search item
- * @return the index of the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int indexOf(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- return Arrays.asList(getTableItems()).indexOf(string);
- }
-
- /**
- * Searches the receiver's list starting at the given, zero-relative index
- * until an item is found that is equal to the argument, and returns the
- * index of that item. If no item is found or the starting index is out of
- * range, returns -1.
- *
- * @param string
- * the search item
- * @param start
- * the zero-relative index at which to begin the search
- * @return the index of the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int indexOf(String string, int start) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- String[] items = getTableItems();
- for (int i = start; i < items.length; i++) {
- if (items[i].equals(string)) {
- return i;
- }
- }
- return -1;
- }
-
- void initAccessible() {
- AccessibleAdapter accessibleAdapter = new AccessibleAdapter() {
- public void getName(AccessibleEvent e) {
- String name = null;
- Label label = getAssociatedLabel();
- if (label != null) {
- name = stripMnemonic(label.getText());
- }
- e.result = name;
- }
-
- public void getKeyboardShortcut(AccessibleEvent e) {
- String shortcut = null;
- Label label = getAssociatedLabel();
- if (label != null) {
- String text1 = label.getText();
- if (text1 != null) {
- char mnemonic = getMnemonic(text1);
- if (mnemonic != '\0') {
- shortcut = "Alt+" + mnemonic; //$NON-NLS-1$
- }
- }
- }
- e.result = shortcut;
- }
-
- public void getHelp(AccessibleEvent e) {
- e.result = getToolTipText();
- }
- };
- getAccessible().addAccessibleListener(accessibleAdapter);
- text.getAccessible().addAccessibleListener(accessibleAdapter);
- table.getAccessible().addAccessibleListener(accessibleAdapter);
-
- arrow.getAccessible().addAccessibleListener(new AccessibleAdapter() {
- public void getName(AccessibleEvent e) {
- e.result = isDropped() ? SWT.getMessage("SWT_Close") : SWT.getMessage("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void getKeyboardShortcut(AccessibleEvent e) {
- e.result = "Alt+Down Arrow"; //$NON-NLS-1$
- }
-
- public void getHelp(AccessibleEvent e) {
- e.result = getToolTipText();
- }
- });
-
- getAccessible().addAccessibleTextListener(new AccessibleTextAdapter() {
- public void getCaretOffset(AccessibleTextEvent e) {
- e.offset = text.getCaretPosition();
- }
- });
-
- getAccessible().addAccessibleControlListener(
- new AccessibleControlAdapter() {
- public void getChildAtPoint(AccessibleControlEvent e) {
- Point testPoint = toControl(e.x, e.y);
- if (getBounds().contains(testPoint)) {
- e.childID = ACC.CHILDID_SELF;
- }
- }
-
- public void getLocation(AccessibleControlEvent e) {
- Rectangle location = getBounds();
- Point pt = toDisplay(location.x, location.y);
- e.x = pt.x;
- e.y = pt.y;
- e.width = location.width;
- e.height = location.height;
- }
-
- public void getChildCount(AccessibleControlEvent e) {
- e.detail = 0;
- }
-
- public void getRole(AccessibleControlEvent e) {
- e.detail = ACC.ROLE_COMBOBOX;
- }
-
- public void getState(AccessibleControlEvent e) {
- e.detail = ACC.STATE_NORMAL;
- }
-
- public void getValue(AccessibleControlEvent e) {
- e.result = getText();
- }
- });
-
- text.getAccessible().addAccessibleControlListener(
- new AccessibleControlAdapter() {
- public void getRole(AccessibleControlEvent e) {
- e.detail = text.getEditable() ? ACC.ROLE_TEXT
- : ACC.ROLE_LABEL;
- }
- });
-
- arrow.getAccessible().addAccessibleControlListener(
- new AccessibleControlAdapter() {
- public void getDefaultAction(AccessibleControlEvent e) {
- e.result = isDropped() ? SWT.getMessage("SWT_Close") : SWT.getMessage("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- });
- }
-
- boolean isDropped() {
- return popup.getVisible();
- }
-
- public boolean isFocusControl() {
- checkWidget();
- if (text.isFocusControl() || arrow.isFocusControl()
- || table.isFocusControl() || popup.isFocusControl()) {
- return true;
- }
- return super.isFocusControl();
- }
-
- void internalLayout(boolean changed) {
- if (isDropped()) {
- dropDown(false);
- }
- Rectangle rect = getClientArea();
- int width = rect.width;
- int height = rect.height;
- Point arrowSize = arrow.computeSize(SWT.DEFAULT, height, changed);
- text.setBounds(0, 0, width - arrowSize.x, height);
- arrow.setBounds(width - arrowSize.x, 0, arrowSize.x, arrowSize.y);
- }
-
- void tableEvent(Event event) {
- switch (event.type) {
- case SWT.Dispose:
- if (getShell() != popup.getParent()) {
- String[] items = getTableItems();
- int selectionIndex = table.getSelectionIndex();
- popup = null;
- table = null;
- createPopup(items, selectionIndex);
- }
- break;
- case SWT.FocusIn: {
- handleFocus(SWT.FocusIn);
- break;
- }
- case SWT.MouseUp: {
- if (event.button != 1) {
- return;
- }
- dropDown(false);
- break;
- }
- case SWT.Selection: {
- int index = table.getSelectionIndex();
- if (index == -1)
- return;
- text.setText(table.getItem(index).getText());
- text.selectAll();
- table.setSelection(index);
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- e.doit = event.doit;
- notifyListeners(SWT.Selection, e);
- event.doit = e.doit;
- break;
- }
- case SWT.Traverse: {
- switch (event.detail) {
- case SWT.TRAVERSE_RETURN:
- case SWT.TRAVERSE_ESCAPE:
- case SWT.TRAVERSE_ARROW_PREVIOUS:
- case SWT.TRAVERSE_ARROW_NEXT:
- event.doit = false;
- break;
- }
- Event e = new Event();
- e.time = event.time;
- e.detail = event.detail;
- e.doit = event.doit;
- e.character = event.character;
- e.keyCode = event.keyCode;
- notifyListeners(SWT.Traverse, e);
- event.doit = e.doit;
- event.detail = e.detail;
- break;
- }
- case SWT.KeyUp: {
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyUp, e);
- break;
- }
- case SWT.KeyDown: {
- if (event.character == SWT.ESC) {
- // Escape key cancels popup list
- dropDown(false);
- }
- if ((event.stateMask & SWT.ALT) != 0
- && (event.keyCode == SWT.ARROW_UP || event.keyCode == SWT.ARROW_DOWN)) {
- dropDown(false);
- }
- if (event.character == SWT.CR) {
- // Enter causes default selection
- dropDown(false);
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.DefaultSelection, e);
- }
- // At this point the widget may have been disposed.
- // If so, do not continue.
- if (isDisposed()) {
- break;
- }
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyDown, e);
- break;
-
- }
- }
- }
-
- void popupEvent(Event event) {
- switch (event.type) {
- case SWT.Paint:
- // draw black rectangle around list
- Rectangle listRect = table.getBounds();
- Color black = getDisplay().getSystemColor(SWT.COLOR_BLACK);
- event.gc.setForeground(black);
- event.gc.drawRectangle(0, 0, listRect.width + 1,
- listRect.height + 1);
- break;
- case SWT.Close:
- event.doit = false;
- dropDown(false);
- break;
- case SWT.Deactivate:
- dropDown(false);
- break;
- }
- }
-
- public void redraw() {
- super.redraw();
- text.redraw();
- arrow.redraw();
- if (popup.isVisible()) {
- table.redraw();
- }
- }
-
- public void redraw(int x, int y, int width, int height, boolean all) {
- super.redraw(x, y, width, height, true);
- }
-
- /**
- * Removes the item from the receiver's list at the given zero-relative
- * index.
- *
- * @param index
- * the index for the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void remove(int index) {
- checkWidget();
- table.remove(index);
- }
-
- /**
- * Removes the items from the receiver's list which are between the given
- * zero-relative start and end indices (inclusive).
- *
- * @param start
- * the start of the range
- * @param end
- * the end of the range
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if either the start or end are
- * not between 0 and the number of elements in the list minus
- * 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void remove(int start, int end) {
- checkWidget();
- table.remove(start, end);
- }
-
- /**
- * Searches the receiver's list starting at the first item until an item is
- * found that is equal to the argument, and removes that item from the list.
- *
- * @param string
- * the item to remove
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * <li>ERROR_INVALID_ARGUMENT - if the string is not found
- * in the list</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void remove(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- int index = Arrays.asList(getTableItems()).indexOf(string);
- table.remove(index);
- }
-
- /**
- * Removes all of the items from the receiver's list and clear the contents
- * of receiver's text field.
- * <p>
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void removeAll() {
- checkWidget();
- text.setText(""); //$NON-NLS-1$
- table.removeAll();
- }
-
- /**
- * Removes the listener from the collection of listeners who will be
- * notified when the receiver's text is modified.
- *
- * @param listener1
- * the listener which should no longer be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see ModifyListener
- * @see #addModifyListener
- */
- public void removeModifyListener(ModifyListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- removeListener(SWT.Modify, listener1);
- }
-
- /**
- * Removes the listener from the collection of listeners who will be
- * notified when the receiver's selection changes.
- *
- * @param listener1
- * the listener which should no longer be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see SelectionListener
- * @see #addSelectionListener
- */
- public void removeSelectionListener(SelectionListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- removeListener(SWT.Selection, listener1);
- removeListener(SWT.DefaultSelection, listener1);
- }
-
- /**
- * Selects the item at the given zero-relative index in the receiver's list.
- * If the item at the index was already selected, it remains selected.
- * Indices that are out of range are ignored.
- *
- * @param index
- * the index of the item to select
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void select(int index) {
- checkWidget();
- if (index == -1) {
- table.deselectAll();
- text.setText(""); //$NON-NLS-1$
- return;
- }
- if (0 <= index && index < table.getItemCount()) {
- if (index != getSelectionIndex()) {
- text.setText(table.getItem(index).getText());
- text.selectAll();
- table.select(index);
- table.showSelection();
- }
- }
- }
-
- public void setBackground(Color color) {
- super.setBackground(color);
- background = color;
- if (text != null) {
- text.setBackground(color);
- }
- if (table != null) {
- table.setBackground(color);
- }
- if (arrow != null) {
- arrow.setBackground(color);
- }
- }
-
- /**
- * Sets the editable state.
- *
- * @param editable
- * the new editable state
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public void setEditable(boolean editable) {
- checkWidget();
- text.setEditable(editable);
- }
-
- public void setEnabled(boolean enabled) {
- super.setEnabled(enabled);
- if (popup != null) {
- popup.setVisible(false);
- }
- if (text != null) {
- text.setEnabled(enabled);
- }
- if (arrow != null) {
- arrow.setEnabled(enabled);
- }
- }
-
- public boolean setFocus() {
- checkWidget();
- return text.setFocus();
- }
-
- public void setFont(Font font) {
- super.setFont(font);
- this.font = font;
- text.setFont(font);
- table.setFont(font);
- internalLayout(true);
- }
-
- public void setForeground(Color color) {
- super.setForeground(color);
- foreground = color;
- if (text != null) {
- text.setForeground(color);
- }
- if (table != null) {
- table.setForeground(color);
- }
- if (arrow != null) {
- arrow.setForeground(color);
- }
- }
-
- /**
- * Sets the text of the item in the receiver's list at the given
- * zero-relative index to the string argument. This is equivalent to
- * <code>remove</code>'ing the old item at the index, and then
- * <code>add</code>'ing the new item at that index.
- *
- * @param index
- * the index for the item
- * @param string
- * the new text for the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list minus 1 (inclusive)</li>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setItem(int index, String string) {
- checkWidget();
- table.getItem(index).setText(0, string);
- }
-
- /**
- * Sets the receiver's list to be the given array of items.
- *
- * @param items
- * the array of items
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
- * <li>ERROR_INVALID_ARGUMENT - if an item in the items
- * array is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setItems(String[] items) {
- checkWidget();
- if (items == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
-
- for (int i = 0; i < items.length; i++) {
- TableItem item = new TableItem(table, SWT.NONE);
- if (items[i].equals(defaultValue)) {
- item.setFont(JFaceResources.getFontRegistry().getBold(
- JFaceResources.DEFAULT_FONT));
- }
- item.setText(0, items[i]);
- }
- }
-
- /**
- * Sets the layout which is associated with the receiver to be the argument
- * which may be null.
- * <p>
- * Note : No Layout can be set on this Control because it already manages
- * the size and position of its children.
- * </p>
- *
- * @param layout
- * the receiver's new layout or null
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setLayout(Layout layout) {
- checkWidget();
- return;
- }
-
- /**
- * Sets the selection in the receiver's text field to the range specified by
- * the argument whose x coordinate is the start of the selection and whose y
- * coordinate is the end of the selection.
- *
- * @param selection
- * a point representing the new selection start and end
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the point is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setSelection(Point selection) {
- checkWidget();
- if (selection == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- text.setSelection(selection.x, selection.y);
- }
-
- /**
- * Sets the contents of the receiver's text field to the given string.
- * <p>
- * Note: The text field in a <code>Combo</code> is typically only capable
- * of displaying a single line of text. Thus, setting the text to a string
- * containing line breaks or other special characters will probably cause it
- * to display incorrectly.
- * </p>
- *
- * @param string
- * the new text
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setText(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- int index = Arrays.asList(getTableItems()).indexOf(string);
- if (index == -1) {
- table.deselectAll();
- text.setText(string);
- return;
- }
- text.setText(string);
- text.selectAll();
- table.setSelection(index);
- table.showSelection();
- }
-
- /**
- * Sets the maximum number of characters that the receiver's text field is
- * capable of holding to be the argument.
- *
- * @param limit
- * new text limit
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setTextLimit(int limit) {
- checkWidget();
- text.setTextLimit(limit);
- }
-
- public void setToolTipText(String string) {
- checkWidget();
- super.setToolTipText(string);
- arrow.setToolTipText(string);
- text.setToolTipText(string);
- }
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (!visible) {
- popup.setVisible(false);
- }
- }
-
- /**
- * Sets the number of items that are visible in the drop down portion of the
- * receiver's list.
- *
- * @param count
- * the new number of items to be visible
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public void setVisibleItemCount(int count) {
- checkWidget();
- if (count < 0) {
- return;
- }
- visibleItemCount = count;
- }
-
- String stripMnemonic(String string) {
- int index = 0;
- int length = string.length();
- do {
- while ((index < length) && (string.charAt(index) != '&')) {
- index++;
- }
- if (++index >= length) {
- return string;
- }
- if (string.charAt(index) != '&') {
- return string.substring(0, index - 1)
- + string.substring(index, length);
- }
- index++;
- } while (index < length);
- return string;
- }
-
- void textEvent(Event event) {
- switch (event.type) {
- case SWT.FocusIn: {
- handleFocus(SWT.FocusIn);
- break;
- }
- case SWT.KeyDown: {
- if (event.character == SWT.CR) {
- dropDown(false);
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.DefaultSelection, e);
- }
- // At this point the widget may have been disposed.
- // If so, do not continue.
- if (isDisposed()) {
- break;
- }
-
- if (event.keyCode == SWT.ARROW_UP
- || event.keyCode == SWT.ARROW_DOWN) {
- event.doit = false;
- if ((event.stateMask & SWT.ALT) != 0) {
- boolean dropped = isDropped();
- text.selectAll();
- if (!dropped) {
- setFocus();
- }
- dropDown(!dropped);
- break;
- }
-
- int oldIndex = getSelectionIndex();
- if (event.keyCode == SWT.ARROW_UP) {
- select(Math.max(oldIndex - 1, 0));
- } else {
- select(Math.min(oldIndex + 1, getItemCount() - 1));
- }
- if (oldIndex != getSelectionIndex()) {
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.Selection, e);
- }
- // At this point the widget may have been disposed.
- // If so, do not continue.
- if (isDisposed()) {
- break;
- }
- }
-
- // Further work : Need to add support for incremental search in
- // pop up list as characters typed in text widget
-
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyDown, e);
- break;
- }
- case SWT.KeyUp: {
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyUp, e);
- break;
- }
- case SWT.Modify: {
- table.deselectAll();
- Event e = new Event();
- e.time = event.time;
- notifyListeners(SWT.Modify, e);
- break;
- }
- case SWT.MouseDown: {
- if (event.button != 1) {
- return;
- }
- if (text.getEditable()) {
- return;
- }
- boolean dropped = isDropped();
- text.selectAll();
- if (!dropped) {
- setFocus();
- }
- dropDown(!dropped);
- break;
- }
- case SWT.MouseUp: {
- if (event.button != 1) {
- return;
- }
- if (text.getEditable()) {
- return;
- }
- text.selectAll();
- break;
- }
- case SWT.Traverse: {
- switch (event.detail) {
- case SWT.TRAVERSE_RETURN:
- case SWT.TRAVERSE_ARROW_PREVIOUS:
- case SWT.TRAVERSE_ARROW_NEXT:
- // The enter causes default selection and
- // the arrow keys are used to manipulate the list contents so
- // do not use them for traversal.
- event.doit = false;
- break;
- }
-
- Event e = new Event();
- e.time = event.time;
- e.detail = event.detail;
- e.doit = event.doit;
- e.character = event.character;
- e.keyCode = event.keyCode;
- notifyListeners(SWT.Traverse, e);
- event.doit = e.doit;
- event.detail = e.detail;
- break;
- }
- }
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- int index = Arrays.asList(getTableItems()).indexOf(defaultValue);
- if (index != -1) {
- table.getItem(index).setFont(
- JFaceResources.getFontRegistry().getBold(
- JFaceResources.DEFAULT_FONT));
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java
deleted file mode 100644
index 4f6b148c9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class UTF8Util {
- private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5',
- '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
- public static String unwindEscapeChars(String s) {
- StringBuffer sb = new StringBuffer(s.length());
- int length = s.length();
- for (int i = 0; i < length; i++) {
- char c = s.charAt(i);
- sb.append(getUnwoundString(c));
- }
- return sb.toString();
- }
-
- private static String getUnwoundString(char c) {
- switch (c) {
- case '\b':
- return "\\b";//$NON-NLS-1$
- case '\t':
- return "\\t";//$NON-NLS-1$
- case '\n':
- return "\\n";//$NON-NLS-1$
- case '\f':
- return "\\f";//$NON-NLS-1$
- case '\r':
- return "\\r";//$NON-NLS-1$
-
- // These can be used unescaped in properties file:
- case '\"':
- return "\\\"";//$NON-NLS-1$
- case '\'':
- return "\\\'";//$NON-NLS-1$
-
- case '\\':
- return "\\\\";//$NON-NLS-1$
-
- case '=':
- return "\\=";//$NON-NLS-1$
-
- // This is only done when writing to the .properties file in
- // #unwindValue(String)
- // case '!':
- // return "\\!";//$NON-NLS-1$
- // case '#':
- // return "\\#";//$NON-NLS-1$
-
- default:
- if (((c < 0x0020) || (c > 0x007e))) {
- return new StringBuffer().append('\\').append('u').append(
- toHex((c >> 12) & 0xF)).append(toHex((c >> 8) & 0xF))
- .append(toHex((c >> 4) & 0xF)).append(toHex(c & 0xF))
- .toString();
-
- }
- return String.valueOf(c);
- }
- }
-
- private static char toHex(int halfByte) {
- return HEX_DIGITS[(halfByte & 0xF)];
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java
deleted file mode 100644
index 100cdad1d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-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;
-
-/**
- * Web app utility methods
- */
-public class WebrootUtil {
-
- /**
- * get the webpath for the project path. 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 path
- * @return the web path
- */
- public static String getWebPath(IPath path) {
- String strWebrootPath = "";
- IProject project = WorkspaceUtil.getProjectFor(path);
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null && webContentPath.isPrefixOf(path)) {
- int start = path.matchingFirstSegments(webContentPath);
- String[] segments = path.segments();
- for (int i = start, n = path.segmentCount(); i < n; i++) {
- strWebrootPath = strWebrootPath
- + IFileFolderConstants.PATH_SEPARATOR + segments[i];
- }
- }
- return strWebrootPath;
- }
-
- /**
- * To see if a resource is under the webcontent folder.
- *
- * @param resource
- * @return true if resource is within the web content folder hierarchy
- */
- public static boolean isUnderWebContentFolder(IResource resource) {
- IPath webContentPath = getWebContentPath(resource.getProject());
- if (webContentPath != null) {
- return webContentPath.isPrefixOf(resource.getFullPath());
- }
- return true;
- }
-
- /**
- * @param project
- * @return full path to web content folder
- */
- public static IPath getWebContentPath(IProject project) {
- if (project != null) {
- return ComponentCore.createComponent(project).getRootFolder().getUnderlyingFolder().getFullPath();
- }
- return null;
- }
-
- /**
- * Return the name of the web content folder. i.e, "WebContent"
- *
- * @param project
- * @return the web content folder name
- */
- public static String getWebContentFolderName(IProject project) {
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null)
- return webContentPath.lastSegment();
- return null;
- }
-
- /**
- * @param project
- * @return folder where for web content
- */
- public static IFolder getWebContentFolder(IProject project) {
- IPath webContentPath = getWebContentPath(project);
- IFolder folder = null;
- if (webContentPath != null) {
- folder = project.getFolder(webContentPath.removeFirstSegments(webContentPath.segmentCount() - 1));
-
- }
- return folder;
- }
-
- /**
- * return the depth of webcontent folder. For example, if the webcontent
- * folder path is /projectname/webContent, then return 2, if it's
- * /projectname/a/webContent, then return 3.
- *
- * @param project
- * @return the depth of webcontent folder
- */
- public static int getWebContentFolderDepth(IProject project) {
- if (project != null) {
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null) {
- return webContentPath.segmentCount();
- }
- }
- // default to 2
- return 2;
- }
-
- /**
- * determine the path of web file is valid or not
- *
- * @param path -
- * the path of web file
- * @return - true - valid web file
- */
- public static boolean isValidWebFile(IPath path) {
- String[] jspExtensions = getJSPFileExtensions();
-
- String extension = path.getFileExtension();
- if (extension != null
- && Arrays.asList(jspExtensions).contains(extension))
- {
- return true;
- }
-
- return false;
- }
-
- /**
- * get the webpath for the project path. 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 project path
- * @return - web path remove from "/projectname/webroot"
- * @deprecated use getWebPath(IPath path) instead.
- */
- public static String getWebPath(String strPath) {
- String strWebrootPath = "";
- if (strPath != null) {
- IPath path = new Path(strPath);
- return getWebPath(path);
- }
- return strWebrootPath;
- }
-
- public static String getPageNameFromWebPath(String strWebPath) {
- String pageName = strWebPath;
-
- if (pageName.startsWith(IFileFolderConstants.PATH_SEPARATOR)) {
- pageName = pageName.substring(1);
- }
-
- String[] jspExtensions = getJSPFileExtensions();
- for (int i = 0, n = jspExtensions.length; i < n; i++) {
- String extension = IFileFolderConstants.DOT + jspExtensions[i];
- if (pageName.endsWith(extension)) {
- pageName = pageName.substring(0, pageName.length()
- - extension.length());
- break;
- }
- }
-
- return pageName;
- }
- /**
- * Get the JSP file extension from Eclipse preference
- * Windows->Preferences->General->Content Types
- *
- * @return String Array for JSP file extensions
- */
- public static String[] getJSPFileExtensions() {
- IContentTypeManager typeManager = Platform.getContentTypeManager();
- IContentType jspContentType = typeManager
- .getContentType("org.eclipse.jst.jsp.core.jspsource");
- if (jspContentType != null) {
- return jspContentType
- .getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
- }
- return null;
- }
-
- /**
- * 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.web" 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 isValidWebProject(IProject project) {
- boolean isValid = false;
- // check for null or inaccessible project
- if (project != null && project.isAccessible()) {
- // TODO: this was jst.jsf before, but we are checking for jst.web
- // the javadoc seems out of sync with the method name
- // check for "jst.web" 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.web".equals(projectFacet.getId())) { //$NON-NLS-1$
- isValid = true;
- break;
- }
- }
- }
- } catch (CoreException ce) {
- JSFUICommonPlugin.getLogger(WebrootUtil.class).error("checking web project", ce);
- }
- }
- return isValid;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java
deleted file mode 100644
index 3423c25aa..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.common.ui.internal.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-
-/**
- * TODO: This class should be abstract to common utility.
- *
- * This class implements management of resource in a workspace.
- */
-public class WorkspaceUtil {
- /** log instance */
- private static final Logger log = JSFUICommonPlugin
- .getLogger(WorkspaceUtil.class);
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public WorkspaceUtil() {
- // TODO: can we delete this?
- }
-
- /**
- * Create the given file in the workspace resource info tree.
- */
- public static void ensureExistsInWorkspace(final IFile resource,
- final InputStream contents) {
- if (resource == null) {
- return;
- }
- IWorkspaceRunnable body = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- if (resource.exists()) {
- resource.setContents(contents, true, false, null);
- } else {
- ensureExistsInWorkspace(resource.getParent(), true);
- resource.create(contents, true, null);
- }
- }
- };
- try {
- getWorkspace().run(body, null);
- } catch (CoreException e) {
- // Test.EclipseWorkspaceTest.Error.FileCreationInWorkspace = Fail in
- // creating file:{0} in the workspace resource info tree.
- log
- .error(
- "Test.EclipseWorkspaceTest.Error.FileCreationInWorkspace", resource.getName(), e);//$NON-NLS-1$
- }
- }
-
- /**
- * Create the given file in the workspace resource info tree.
- */
- public static void ensureExistsInWorkspace(IFile resource, String contents) {
- // FIXME: We'll need some way for handing file encoding.
- ensureExistsInWorkspace(resource, new ByteArrayInputStream(contents
- .getBytes()));
- }
-
- /**
- * Create the given resource in the workspace resource info tree.
- */
- public static void ensureExistsInWorkspace(final IResource resource,
- final boolean local) {
- IWorkspaceRunnable body = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- create(resource, local);
- }
- };
- try {
- getWorkspace().run(body, null);
- } catch (CoreException e) {
- // Test.EclipseWorkspaceTest.Error.ResourceCreationInWorkspace =
- // Fail in creating resource:{0} in the workspace resource info
- // tree.
- log
- .error(
- "Test.EclipseWorkspaceTest.Error.ResourceCreationInWorkspace", resource.getName(), e);//$NON-NLS-1$
- }
- }
-
- /**
- * crate the resource if the resource is not existed, create a new one.
- *
- * @param resource -
- * resource instance
- * @param local -
- * a flag controlling whether or not the folder will be local
- * after the creation
- * @throws CoreException
- */
- protected static void create(final IResource resource, boolean local)
- throws CoreException {
- if (resource == null || resource.exists()) {
- return;
- }
- if (!resource.getParent().exists()) {
- create(resource.getParent(), local);
- }
- switch (resource.getType()) {
- case IResource.FILE:
- ((IFile) resource).create(local ? new ByteArrayInputStream(
- new byte[0]) : null, true, getMonitor());
- break;
- case IResource.FOLDER:
- ((IFolder) resource).create(true, local, getMonitor());
- break;
- case IResource.PROJECT:
- ((IProject) resource).create(getMonitor());
- ((IProject) resource).open(getMonitor());
- break;
- }
- }
-
- /**
- * create and return a NullProgressMonitor
- *
- * @return - NullProgressMonitor
- */
- public static IProgressMonitor getMonitor() {
- return new NullProgressMonitor();
- }
-
- /**
- * Get the project reference for a given path
- *
- * @param path -
- * the path
- * @return IProject - the project reference
- */
- public static IProject getProjectFor(IPath path) {
- String[] segs = path.segments();
- String projectPath = new String();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
- .getProjects();
- IProject project = null;
- for (int p = 0; p < projects.length; p++) {
- if (projects[p].isOpen()) {
- for (int s = 0; s < segs.length; s++) {
- if (segs[s].equalsIgnoreCase(projects[p].getName())) {
- // Once we have a match on the project name, then
- // the remainder of the segments equals the project path
- for (int s2 = s + 1; s2 < segs.length; s2++) {
- projectPath = projectPath
- + IFileFolderConstants.PATH_SEPARATOR
- + segs[s2];
- }
- project = projects[p];
- break;
- }
- }
- }
- }
- if (project == null) {
- return null;
- }
-
- // TODO: still don't understand why this refreshLocal is necessary
- // for now, going to only allow it if this method is called
- // when the tree isn't locked. This shouldn't cause a regression, since
- // when the call fails currently things keep on going due to the catch
- if (!project.getWorkspace().isTreeLocked())
- {
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (CoreException e) {
- // TODO C.B.:pushing this down to a warning because it creates really
- // spurious output. Don't know why we are calling refreshLocal at all.
- JSFUICommonPlugin.getLogger(WorkspaceUtil.class).info("Error.RefreshingLocal", e);
- }
- }
-
- IResource res = project.findMember(new Path(projectPath));
- if ((res != null) && (res.exists())) {
- return project;
- }
- return null;
- }
-
- /**
- * Get the project reference for a given file
- *
- * @param file -
- * the IFile file reference
- * @return IProject - the project reference
- */
- public static IProject getProjectFor(IFile file) {
- IPath testPath = new Path(file.getFullPath().toOSString());
- return getProjectFor(testPath);
- }
-
- /**
- * Get the project reference for a given file
- *
- * @param file -
- * the File file reference
- * @return IProject - the project reference
- */
- public static IProject getProjectFor(File file) {
- IPath testPath = new Path(file.getAbsolutePath());
- return getProjectFor(testPath);
- }
-
- /**
- * Get the project-relative resource reference for a given path
- *
- * @param path -
- * the path
- * @return IResource - the project-relative resource
- */
- public static IResource getProjectRelativeResource(IPath path) {
- String[] segs = path.segments();
- String projectPath = new String();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
- .getProjects();
- IProject project = null;
- for (int p = 0; p < projects.length; p++) {
- if (projects[p].isOpen()) {
- for (int s = 0; s < segs.length; s++) {
- if (segs[s].equalsIgnoreCase(projects[p].getName())) {
- // Once we have a match on the project name, then
- // the remainder of the segments equals the project path
- for (int s2 = s + 1; s2 < segs.length; s2++) {
- projectPath = projectPath
- + IFileFolderConstants.PATH_SEPARATOR
- + segs[s2];
- }
- project = projects[p];
- break;
- }
- }
- }
- }
- if (project == null) {
- return null;
- }
-
- return project.getFile(projectPath);
- }
-
- /**
- * Get the project-relative resource reference for a given file
- *
- * @param file -
- * the File file reference
- * @return IResource - the project-relative resource
- */
- public static IResource getProjectRelativeResource(File file) {
- IPath testPath = new Path(file.getAbsolutePath());
- return getProjectRelativeResource(testPath);
- }
-}
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 304e86186..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <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/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.cvsignore
deleted file mode 100644
index 40e79ad80..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-javaCompiler...args
-@dot
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.core.resources.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c9896cd05..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:03:23 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e45508d63..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,77 +0,0 @@
-#Tue Apr 10 09:09:10 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-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=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c152..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
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 68b1433b9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,55 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.facesconfig.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.common.ui.properties;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.jsf.facesconfig.ui;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.dialog;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.page;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.page.detail;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.preference;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.provider;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.section;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.util;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.wizard;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/about.html b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/about.html
deleted file mode 100644
index 04d4782f4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/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>June 06, 2007</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>
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 e34e43f5a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- icons/,\
- plugin.xml,\
- plugin.properties,\
- cheatsheets/,\
- about.html
-javacSource=1.5
-javacTarget=1.5
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 2776386a8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<cheatsheet title="Faces Configuration Editor">
-
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to eidt a JSF
- configuration file with Faces Config Editor.
- <br />
- <br />
- To learn more about using cheat sheets, click the help
- button in the top right corner (?).
- </description>
- </intro>
-
- <!-- Item -->
-
- <item title="Open the J2EE perspective"
- href="/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html"
- dialog="false" skip="true">
- <description>
- To open the J2EE perspective, select
- <b>Window-&gt;Open Perspective-&gt;Other...</b>
- and choose
- <b>J2EE</b>
- .
- <br />
- <br />
- Alternatively, click the following button to perform the
- task.
- </description>
- <command
- serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)" />
- </item>
-
- <!-- Item -->
-
- <item title="Create the JSF web project"
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html"
- dialog="true" skip="false">
- <description>
- To create the JSF web application perform the following
- steps
- </description>
- <subitem
- label="Select &quot;File-&gt;New-&gt;Project...&quot; from the main menu and choose &quot;Dynamic Web Project&quot; from the resulting &quot;New Project&quot; dialog box"
- skip="false">
- <command
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard)" />
- </subitem>
- <subitem
- label="Input &quot;JSFApplication&quot; into the &quot;Project Name&quot; text box"
- skip="false" />
- <subitem
- label="Select &quot;JavaServer Faces v1.1 Project&quot; in the &quot;Configurations&quot; dropdown box"
- skip="false" />
- <subitem
- label="Accept the rest of the default preloaded values on the &quot;Dynamic Web Project&quot; page and click &quot;Next&quot;"
- skip="false" />
- <subitem
- label="Accept the rest of the default preloaded values on the &quot;Project Facets&quot; page and click &quot;Next&quot;"
- skip="false" />
- <subitem
- label="Accept the rest of the default preloaded values on the &quot;Web Module&quot; page and click &quot;Next&quot;"
- skip="false" />
- <subitem
- label="Specify JSF Facet Settings on the &quot;JSF Capabilities&quot; page and click &quot;Finish&quot;"
- skip="false" />
- </item>
-
- <item title="Open the JSF configuration file"
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html"
- dialog="true" skip="false">
- <description>
- To open the JSF configuration file, Expand the
- WebContent/WEB-INF/ folder in the &quot;Project
- Explorer&quot; view; Double click on the
- &quot;faces-config.xml&quot; file to open it. Or right click
- on it then select &quot;Open With&quot; -> &quot;FacesConfig
- Editor&quot;
- </description>
- <subitem
- label="Expand the /JSFApplication/WebContent/WEB-INF/ folder in the &quot;Project Explorer&quot; view; "
- skip="true">
- </subitem>
- <subitem
- label="Double click on the &quot;faces-config.xml&quot; file to open it.
- Or right click on it then select &quot;Open With&quot; -> &quot;FacesConfig Editor&quot;"
- skip="false">
- <command
- serialization="org.eclipse.ui.navigate.openResource(filePath=JSFApplication/WebContent/WEB-INF/faces-config.xml)" />
- </subitem>
- </item>
-
-
- <item href=" " title="Get an introduction on the FacesConfig Editor"
- dialog="false" skip="true">
- <description>
- On the &quot;Introduction &quot; page, there are some
- introductions about the FacesConfig Editor, and some links
- to start work with it, or show user the tutorial and help
- documentation.
- </description>
- </item>
-
-
- <item href=" " title="Get an overview of the content" dialog="false"
- skip="true">
- <description>
- On the &quot;Overview &quot; page, there are several tables
- that list the main elements defined in the current faces
- config file. By double-clicking on an element, user could be
- guided to the corresponding page to edit it.
- </description>
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/define_navigations.html"
- title="Create a Navigation Rule">
- <description>
- To create a navigation rule perform the following steps
- </description>
- <subitem
- label="Use the JSP Page wizard to create a page called &quot; login.jsp &quot; in the Web Content folder of the new application.
- In the Select Templates page of the wizard, select the &quot;New JSP(html) &quot; template. Click Finish."
- skip="false">
- <command
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.jsp.ui.internal.wizard.NewJSPWizard)" />
- </subitem>
- <subitem
- label="In the same way, create a page called &quot;welcome.jsp &quot; ."
- skip="false">
- <command
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.jsp.ui.internal.wizard.NewJSPWizard)" />
- </subitem>
- <subitem
- label="Select the &quot;Page&quot; control from the &quot;Palette&quot; and drop it on the &quot;Navigation&quot; tab.
- Choose the page in the resulting &quot;Select JSP File&quot; dialog. "
- skip="false" />
- <subitem
- label="Connect the two pages. Click on the &quot;Link&quot; control in the &quot;Palette&quot;, select the &quot;login&quot; page and draw a line to the &quot;welcome&quot; page.
- Select the line in the &quot;Navigation&quot; tab and in the property view, set the value of the &quot;from-outcome&quot; to &quot;login&quot; . "
- skip="false" />
- <subitem
- label="Swith to the &quot;Source&quot; page, will find that there is a navigation-rule element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/create_managedbean.html"
- title="Create a Managed Bean">
- <description>
- To create a managed bean perform the following steps
- </description>
- <subitem
- label="Switch to the &quot;ManagedBean&quot; page; click the &quot;New&quot; button, the new managed bean wizard pops up."
- skip="false" />
- <subitem
- label="On the &quot;Java Class Selection&quot; page, choose &quot;Create a new Java class&quot;, then click &quot;Next&quot;."
- skip="false" />
- <subitem
- label="On the &quot;Java Class&quot; page, input &quot;com.tutorial&quot; into the &quot;Package&quot; field and input &quot;LoginBean&quot; into the &quot;Name&quot; field,
- then click &quot;Next&quot; to the next page."
- skip="false" />
- <subitem
- label="On the &quot;Managed Bean Configuration&quot; page, accept the default values and click &quot;Finish&quot; to finish this wizard."
- skip="false" />
- <subitem
- label="Swith to the &quot;Source&quot; page, will find that there is a managed-bean element created."
- skip="true" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_component.html"
- title="Create a Component">
- <description>
- To create a component perform the following steps
- </description>
- <subitem
- label="Switch to the &quot;Component&quot; page; expand the &quot;Components&quot; section; "
- skip="false" />
- <subitem
- label="Click the &quot;New&quot; button, a new empty component element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this component, for example &quot;Component Type&quot;, &quot;Component Class&quot;."
- skip="false" />
- <subitem
- label="Swith to the &quot;Source&quot; page, will find that there is a component element created."
- skip="false" />
- </item>
-
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_converter.html"
- title="Create a Converter">
- <description>
- To create a converter perform the following steps
- </description>
- <subitem
- label="Switch to the &quot;Component&quot; page; expand the &quot;Converters&quot; section; "
- skip="false" />
- <subitem
- label="Click the &quot;New&quot; button, a new empty converter element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this converter, for example &quot;Converter ID&quot;, &quot;Converter Class&quot;."
- skip="false" />
- <subitem
- label="Swith to the &quot;Source&quot; page, will find that there is a converter element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_renderkit.html"
- title="Create a Render Kit">
- <description>
- To create a render-kit perform the following steps
- </description>
- <subitem
- label="Switch to the &quot;Component&quot; page; expand the &quot;RenderKits&quot; section; "
- skip="false" />
- <subitem
- label="Click the &quot;New&quot; button, a new empty render-kit element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this converter, for example &quot;Renderkit ID&quot;, &quot;Renderkit Class&quot;."
- skip="false" />
- <subitem
- label="Swith to the &quot;Source&quot; page, will find that there is a render-kit element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_validator.html"
- title="Create a Validator">
- <description>
- To create a validator perform the following steps
- </description>
- <subitem
- label="Switch to the &quot;Component&quot; page; expand the &quot;Validators&quot; section; "
- skip="false" />
- <subitem
- label="Click the &quot;New&quot; button, a new empty validator element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this converter, for example &quot;Validator ID&quot;, &quot;Validator Class&quot;."
- skip="false" />
- <subitem
- label="Swith to the &quot;Source&quot; page, will find that there is a validator element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html"
- title="Editing other elements on the Others Page">
- <description>
- On the &quot;Others&quot; page, there are several sections
- for editing the elements such as
- &quot;action-listener&quot;, &quot;locale-config&quot;, and
- so on.
- </description>
- </item>
-
- <item title="Source Page">
- <description>
- The &quot;Source&quot; page is a embeded XML editor, user can edit the xml source of faces config directly here.
- </description>
- </item>
-
- <item title="Completion">
- <description>
- Congratulations, you should now be able to use this editor fluently.
- </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 7fc983a6d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
+++ /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
-############################################################################
-plugin.name=JavaServer Faces Tools - FacesConfig Editor
-plugin.provider=Eclipse.org
-
-# 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
-
-#preference page
-preferencepage.jsffacesconfigui.name=FacesConfig Editor
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 19845ce4b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml
+++ /dev/null
@@ -1,105 +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/org.eclipse.jst.jsf.ui.JSFRootPage"
- class="org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences"
- id="org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences"
- name="%preferencepage.jsffacesconfigui.name"/>
- </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="%facesConfigEditor">
- <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.common.ui.introductionPage">
- <introductionpage name="%pageflow.editor.intro.name"
- description="%pageflow.editor.intro.description">
- <introductionelement icon="icons/FacesConfig_Introduction.gif"
- heading="%pageflow.editor.intro.section.heading"
- 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.common.ui.internal.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.common.ui.internal.actions.LoadCheatSheetAction"
- text="%pageflow.editor.intro.cheatsheets.text"
- hyperlink="%pageflow.editor.intro.cheatsheets.link"/>
- <introductionelement actionparameters="org.eclipse.jst.jsf.facesconfig.ui.use_facesconfig_editor"
- icon="icons/overview_obj.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.internal.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>
- <!--<extension
- point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
- <propertyContributor
- 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.views.properties.tabbed.propertyTabs">
- <propertyTabs contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor">
- <propertyTab
- category="attribute"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.attribute"
- label="%propertyTab.attribute"/>
- <propertyTab
- category="general"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.general"
- label="%propertyTab.general"/>
- </propertyTabs>
- </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 0def0398e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
+++ /dev/null
@@ -1,1541 +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.osgi.util.NLS;
-
-/**
- * Provides localized messages from EditorMessages.properties.
- */
-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 AddEditManagedPropertyDialog_Add;
-
- public static String AddEditManagedPropertyDialog_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_ErrorHandlingUndoConflicts_DialogMessage;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_ErrorHandlingUndoConflicts_DialogTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_WaitForLoad_EditorTabTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Remove;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Add_more;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Edit_more;
-
- /**
- * see EditorMessages.properties
- */
- public static String Remove_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String Remove_Msg;
-
- /**
- * see EditorMessages.properties
- */
- public static String FindType;
-
- /**
- * see EditorMessages.properties
- */
- public static String FindType_Filter;
-
- /**
- * see EditorMessages.properties
- */
- public static String FindType_Error_CannotFindType;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Introduction_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Overview_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Pageflow_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_ManagedBeans_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Components_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Others_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Source_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_title;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_help_HelpContextID;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanMasterSection_Description;
-
-// public static String ManagedBeanMasterSection_HelpContextID;
-//
-// public static String ManagedBeanMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_Desc;
-
-// public static String ManagedBeanGeneralSection_HelpContextID;
-//
-// public static String ManagedBeanGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_ManagedBeanName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_ManagedBeanClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_ManagedBeanScope;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_Description;
-
-// public static String InitializationSection_HelpContextID;
-//
-// public static String InitializationSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Title_NewPropertyEntry;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyClass_Browse;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_ValueType;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanProeprtyEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanProeprtyEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Value_Change;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_FindType;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_FindType_Filter;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType_Map;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType_List;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_PropertyTable_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_PropertyTable_Class;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_PropertyTable_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapType_KeyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapType_ValueClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapTable_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapTable_Key;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapTable_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ListType_ValueClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ListTable_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ListTable_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String ListEntriesEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ListEntriesWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ListEntriesEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_page_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_page_id;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_page_title;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_PageflowOverview_summary;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_noplugin;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_nooverview;
-
-// public static String OverviewPage_EditorSection_Help_HelpContextID;
-//
-// public static String OverviewPage_EditorSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_label_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_label_version;
-
-// public static String OverviewPage_GeneralSection_Help_HelpContextID;
-//
-// public static String OverviewPage_GeneralSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_table_col1;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_table_col2;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_table_col3;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_pageflowPageID;
-
-// public static String OverviewPage_NavigationSection_Help_HelpContextID;
-//
-// public static String OverviewPage_NavigationSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_table_namecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_table_scopecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_table_classcol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_managedbeanPageID;
-
-// public static String OverviewPage_ManagedBeanSection_Help_HelpContextID;
-//
-// public static String OverviewPage_ManagedBeanSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_table_typecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_table_namecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_componentsPageID;
-
-// public static String OverviewPage_ComponentsSection_Help_HelpContextID;
-//
-// public static String OverviewPage_ComponentsSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_table_typecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_table_namecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_table_valuecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_othersPageID;
-
-// public static String OverviewPage_OthersSection_Help_HelpContextID;
-//
-// public static String OverviewPage_OthersSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyGroup_error_EmptyName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyGroup_error_EmptyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesEditGroup_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditGroup_Key;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditGroup_error_EmptyKey;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditGroup_error_DuplicateKey;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditDialog_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditGroup_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentsPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentMasterSection_Description;
-
-// public static String ComponentMasterSection_HelpContextID;
-//
-// public static String ComponentMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Description;
-
-// public static String ComponentGeneralSection_HelpContextID;
-//
-// public static String ComponentGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_ComponentType;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_ComponentClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitMasterSection_Description;
-
-// public static String RenderKitMasterSection_HelpContextID;
-//
-// public static String RenderKitMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Description;
-
-// public static String RenderKitGeneralSection_HelpContextID;
-//
-// public static String RenderKitGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_RenderKitID;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_RenderKitClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Description;
-
-// public static String RendererSection_HelpContextID;
-//
-// public static String RendererSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_NameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_ComponentFamilyColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_TypeColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_ClassColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_ComponentFamilyValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_TypeValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_RendererClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Error_ComponentFamilyEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Error_RendererTypeEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Error_RendererClassEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_SelectComponentFamilyDialog_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_ComponentFamilyCaption;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_ComponentFamilyLabel;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterMasterSection_Description;
-
-// public static String ConverterMasterSection_HelpContextID;
-//
-// public static String ConverterMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Description;
-
-// public static String ConverterGeneralSection_HelpContextID;
-//
-// public static String ConverterGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_ConverterID;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_ConverterForClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_ConverterClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorMasterSection_Description;
-
-// public static String ValidatorMasterSection_HelpContextID;
-//
-// public static String ValidatorMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Description;
-
-// public static String ValidatorGeneralSection_HelpContextID;
-//
-// public static String ValidatorGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_ValidatorID;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_ValidatorClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Description;
-
-// public static String AttributeSection_HelpContextID;
-//
-// public static String AttributeSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_NameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_ClassColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_DefaultValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_SuggestedValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_AttributeName;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_AttributeClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_DefaultValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_SuggestedValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Error_NameEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Error_ClassEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Description;
-
-// public static String PropertySection_HelpContextID;
-//
-// public static String PropertySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_NameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_ClassColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_DefaultValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_SuggestedValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_PropertyName;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_PropertyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_DefaultValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_SuggestedValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Error_NameEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Error_ClassEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Description;
-
-// public static String FacetSection_HelpContextID;
-//
-// public static String FacetsSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Table_DisplayNameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Table_FacetNameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Table_DescriptionColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_FacetName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Error_NameEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String OthersPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ActionListenerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ActionListenerSection_Description;
-
-// public static String ActionListenerSection_HelpContextID;
-//
-// public static String ActionListenerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Description;
-
-// public static String MessageBundleSection_HelpContextID;
-//
-// public static String MessageBundleSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Dialog_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Dialog_Message_SelectPropertyFile;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Dialog_Message_AlreadyExists;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Description;
-
-// public static String LocaleConfigSection_HelpContextID;
-//
-// public static String LocaleConfigSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_WindowTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_LabelText;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_AlreadyExistsError;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Description;
-
-// public static String DefaultRenderKitIDSection_HelpContextID;
-//
-// public static String DefaultRenderKitIDSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_WindowTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_LabelText;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_AlreadyExistsError;
-
- /**
- * see EditorMessages.properties
- */
- public static String NavigationHandlerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String NavigationHandlerSection_Description;
-
-// public static String NavigationHandlerSection_HelpContextID;
-//
-// public static String NavigationHandlerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ViewHandlerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ViewHandlerSection_Description;
-
-// public static String ViewHandlerSection_HelpContextID;
-//
-// public static String ViewHandlerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String StateManagerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String StateManagerSection_Description;
-
-// public static String StateManagerSection_HelpContextID;
-//
-// public static String StateManagerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertyResolverSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertyResolverSection_Description;
-
-// public static String PropertyResolverSection_HelpContextID;
-//
-// public static String PropertyResolverSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String VariableResolverSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String VariableResolverSection_Description;
-
-// public static String VariableResolverSection_HelpContextID;
-//
-// public static String VariableResolverSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ApplicationFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ApplicationFactorySection_Description;
-
-// public static String ApplicationFactorySection_HelpContextID;
-//
-// public static String ApplicationFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesContextFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesContextFactorySection_Description;
-
-// public static String FacesContextFactorySection_HelpContextID;
-//
-// public static String FacesContextFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String LifecycleFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String LifecycleFactorySection_Description;
-
-// public static String LifecycleFactorySection_HelpContextID;
-//
-// public static String LifecycleFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitFactorySection_Description;
-
-// public static String RenderKitFactorySection_HelpContextID;
-//
-// public static String RenderKitFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String PhaseListenerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String PhaseListenerSection_Description;
-
-// public static String PhaseListenerSection_HelpContextID;
-//
-// public static String PhaseListenerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String MultiPageEditorOutlinePage_noOutline;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Error_OpenModel_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Error_OpenModel;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_WaitForLoadPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ModelLoader_LoadingModelJobName;
-
- /**
- * Align bottom action label.
- */
- public static String AlignmentAction_AlignBottomAction_Label;
-
- /**
- * Align bottom action tooltip.
- */
- public static String AlignmentAction_AlignBottomAction_Tooltip;
-
- /**
- * Align center action label.
- */
- public static String AlignmentAction_AlignCenterAction_Label;
-
- /**
- * Align center action tooltip.
- */
- public static String AlignmentAction_AlignCenterAction_Tooltip;
-
- /**
- * Align left action label.
- */
- public static String AlignmentAction_AlignLeftAction_Label;
-
- /**
- * Align left action tooltip.
- */
- public static String AlignmentAction_AlignLeftAction_Tooltip;
-
- /**
- * Align middle action label.
- */
- public static String AlignmentAction_AlignMiddleAction_Label;
-
- /**
- * Align middle action tooltip.
- */
- public static String AlignmentAction_AlignMiddleAction_Tooltip;
-
- /**
- * Align right action label.
- */
- public static String AlignmentAction_AlignRightAction_Label;
-
- /**
- * Align right action tooltip.
- */
- public static String AlignmentAction_AlignRightAction_Tooltip;
-
- /**
- * Align top action label.
- */
- public static String AlignmentAction_AlignTopAction_Label;
-
- /**
- * Align top action tooltip.
- */
- public static String AlignmentAction_AlignTopAction_Tooltip;
-
-}
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 095ef07b3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
+++ /dev/null
@@ -1,449 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-###############################################################################
-####################################################
-# 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
-
-FacesConfigEditor_Error_OpenModel_Title = Error
-FacesConfigEditor_ErrorHandlingUndoConflicts_DialogTitle=File Conflict
-FacesConfigEditor_ErrorHandlingUndoConflicts_DialogMessage=There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
-FacesConfigEditor_Error_OpenModel = Cannot open the faces-config file, this project is not a web project.
-####################################################
-# Tab's name for multipageeditor of faces-config
-####################################################
-FacesConfigEditor_Introduction_TabName = Introduction
-FacesConfigEditor_Overview_TabName = Overview
-FacesConfigEditor_Pageflow_TabName = Navigation Rule
-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
-
-
-##managed bean general section
-ManagedBeanGeneralSection_Name = Managed Bean
-
-ManagedBeanGeneralSection_Desc = This section describes general configuration of this managed bean
-
-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
-
-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_name = Overview
-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
-
-# 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:
-
-#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
-
-
-# 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
-
-#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
-
-#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
-
-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:
-
-
-##Components General Section
-ComponentGeneralSection_Name = General
-ComponentGeneralSection_Description = This section describes the general information of this component.
-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:
-
-
-##RenderKits General Section
-RenderKitGeneralSection_Name = General
-RenderKitGeneralSection_Description = This section describes the general information of this render-kit.
-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_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:
-
-
-##Converter General Section
-ConverterGeneralSection_Name = General
-ConverterGeneralSection_Description = This section describes the general information of this converter.
-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:
-
-
-##Validator General Section
-ValidatorGeneralSection_Name = General
-ValidatorGeneralSection_Description = This section describes general information of this Validator
-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_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_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_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 =
-
-
-##Application Message Bundle Section
-MessageBundleSection_Name = Message Bundle
-MessageBundleSection_Description =
-
-
-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_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_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 =
-
-
-##Application View Handler Section
-ViewHandlerSection_Name = View Handler
-ViewHandlerSection_Description =
-
-
-##Application State Manager Section
-StateManagerSection_Name = State Manager
-StateManagerSection_Description =
-
-
-##Application Property Resolver Section
-PropertyResolverSection_Name = Property Resolver
-PropertyResolverSection_Description =
-
-##Application Variable Resolver Section
-VariableResolverSection_Name = Variable Resolver
-VariableResolverSection_Description =
-
-
-##Factory Application Factory Section
-ApplicationFactorySection_Name = Application Factory
-ApplicationFactorySection_Description =
-
-
-##Factory Faces Context Factory Section
-FacesContextFactorySection_Name = Faces Context Factory
-FacesContextFactorySection_Description =
-
-
-##Factory Lifecycle Factory Section
-LifecycleFactorySection_Name = Lifecycle Factory
-LifecycleFactorySection_Description =
-
-
-##Factory Render Kit Factory Section
-RenderKitFactorySection_Name = Render Kit Factory
-RenderKitFactorySection_Description =
-
-##LifeCycle Phase Listener Section
-PhaseListenerSection_Name = Phase Listener
-PhaseListenerSection_Description =
-
-####################################################
-#Resource for MultiPageEditorOutlinePage
-####################################################
-MultiPageEditorOutlinePage_noOutline = An outline is not available.
-
-
-FacesConfigEditor_WaitForLoadPage_Title= Please wait while the editor finishes loading...
-FacesConfigEditor_WaitForLoad_EditorTabTitle=Wait for Load
-ModelLoader_LoadingModelJobName="Loading faces-config model"
-
-###########################
-# AlignmentAction messages
-###########################
-AlignmentAction_AlignLeftAction_Tooltip=Align Left
-AlignmentAction_AlignLeftAction_Label=Align &Left
-AlignmentAction_AlignRightAction_Tooltip=Align Right
-AlignmentAction_AlignRightAction_Label=Align &Right
-AlignmentAction_AlignTopAction_Tooltip=Align Top
-AlignmentAction_AlignTopAction_Label=Align &Top
-AlignmentAction_AlignBottomAction_Tooltip=Align Bottom
-AlignmentAction_AlignBottomAction_Label=Align &Bottom
-AlignmentAction_AlignCenterAction_Tooltip=Align Center
-AlignmentAction_AlignCenterAction_Label=Align &Center
-AlignmentAction_AlignMiddleAction_Tooltip=Align Middle
-AlignmentAction_AlignMiddleAction_Label=Align &Middle
-AddEditManagedPropertyDialog_Add=Add Managed Property
-AddEditManagedPropertyDialog_Edit=Edit Managed Property
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 69cbda413..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java
+++ /dev/null
@@ -1,275 +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.common.ui.internal.guiutils.Alerts;
-import org.eclipse.jst.jsf.common.ui.internal.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;
- }
-
- /**
- * @return the alerts objects associated with this plugin for alerting the user.
- */
- 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;
- }
- 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 = 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 = 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 c8eef1a5a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-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 = Cannot open the page in the page 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 c8b00f232..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java
+++ /dev/null
@@ -1,179 +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.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;
-
- //private IEditorPart targetEditor;
-
- public FacesConfigActionBarContributor() {
- super();
- }
-
- 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();
- }
- return super.getActionBars();
- }
-
- public IWorkbenchPage getPage() {
- 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);
- }
-
-// 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() {
-// //
-// }
-
- 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 0df29c38b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
+++ /dev/null
@@ -1,1368 +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 java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IFile;
-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.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.text.IDocument;
-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.common.ui.internal.actions.IOpenPage;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-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.page.WaitForLoadPage;
-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.preference.GEMPreferences;
-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.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.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-/**
- * This is the main editor for the faces-config file. Note that the model
- * load can involve long-running socket operations (shouldn't but can),
- * so the editor UI is load asynchronously. This is means that any
- * operations that need to be executed on editor open should be run
- * using AddPagesTask.pageSafeExecute() to ensure that they occur
- * after all editor pages have finished loading.
- *
- * @author sfshi
- *
- */
-public class FacesConfigEditor extends FormEditor implements
- IEditingDomainProvider, ISelectionProvider {
-
- /**
- * This editor's ID. TODO: this should prob be in plugin.properties?
- */
- public static final String EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"; //$NON-NLS-1$
-
- /**
- * 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;
-
- private Collection selectionChangedListeners = new ArrayList();
-
- private ISelection editorSelection = StructuredSelection.EMPTY;
-
- private IContentOutlinePage outlinePage;
-
- private IProject currentProject;
-
- private boolean isWebProject;
-
- private ModelLoader _modelLoader;
-
- /**
- * only true once dispose() has been called
- * used to signal that the editor was disposed.
- */
- private boolean _isDisposed; // = false;
-
- /**
- * Used to load editor pages when the model is loaded
- */
- private final AddPagesTask _addPagesTask = new AddPagesTask();
-
- /**
- * Default constructor
- */
- 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();
-
- @SuppressWarnings("hiding") //$NON-NLS-1$
- protected Collection changedResources = new ArrayList();
-
- @SuppressWarnings("hiding") //$NON-NLS-1$
- 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 //$NON-NLS-1$
- .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 {
- try {
- super.init(site, input);
- } catch (Exception e) {
- MessageDialog.openError(null,
- EditorMessages.FacesConfigEditor_Error_OpenModel_Title,
- EditorMessages.FacesConfigEditor_Error_OpenModel);
- throw new PartInitException(
- EditorMessages.FacesConfigEditor_Error_OpenModel);
- }
-
- 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)
- {
- isWebProject = matches(input);
- super.setInput(input);
-
- IFile inputFile = (IFile) input.getAdapter(IFile.class);
- if (inputFile != null)
- {
- final IProject project = inputFile.getProject();
- final IPath inputPath = inputFile.getFullPath();
-
- _modelLoader = new ModelLoader();
- _modelLoader.load(project, inputPath, isWebProject, _addPagesTask);
- }
- }
-
-
- protected void addPages()
- {
- // try loading wait page
- // if we get to here before model load completes,
- // then wait page will give the user the indication
- // that something is happening in the background before
- // the editor full loads.
- // if the model is already loaded, this call should do nothing
- _addPagesTask.maybeAddWaitPage();
- }
-
- /**
- * This runnable is used to used to manage the loading of the
- * editor pages for editor in a deferred fashion. Because the model
- * loading for this editor can be noticably long and (unfortunately)
- * may involve socket calls that block, loadModel(), runs this on a
- * separate thread. This class is intended to be used in two ways:
- *
- * 1) by the model loading code to signal it is finished by executing
- * the run() via a display.asyncExec().
- *
- * 2) by the addPages() call back on the the main editor as a way to
- * load a "Please wait for loading" page if the loading is still running
- * by the time the editor is ready to visualize itself.
- *
- * Note that in both cases methods of this class *must* be running on the
- * main display thread.
- *
- * @author cbateman
- *
- */
- private class AddPagesTask extends ModelLoader.ModelLoaderComplete
- {
- private final AtomicBoolean _arePagesLoaded = new AtomicBoolean(false); // set to true when the regular editor pages are loaded
- private FormPage _waitPage;
- private List<Runnable> _deferredRunnables = new ArrayList<Runnable>();
-
- /**
- * If the editor pages are loaded, runnable.run() is invoked immediately
- * If the editor pages are not loaded yet, runnable is queued and will be
- * executed in the order they are added immediately after the pages are loaded
- *
- * @param runnable
- */
- public synchronized void pageSafeExecute(Runnable runnable)
- {
- if (!_isDisposed)
- {
- if (!_arePagesLoaded.get())
- {
- _deferredRunnables.add(runnable);
- }
- else
- {
- runnable.run();
- }
- }
- }
-
- /**
- * @return true if the pages are loaded
- */
- public synchronized boolean getArePagesLoaded()
- {
- return _arePagesLoaded.get();
- }
-
- /**
- * Remove the wait page if present.
- */
- public synchronized void removeWaitPage()
- {
- if (_waitPage != null)
- {
- int index = _waitPage.getIndex();
-
- if (index >= 0)
- {
- removePage(index);
- }
- }
- }
-
- /**
- * Add the wait page if the main pages aren't already loaded
- */
- public synchronized void maybeAddWaitPage()
- {
- // only load the wait page if the other pages haven't been loaded
- if (!getArePagesLoaded())
- {
- _waitPage = new WaitForLoadPage(FacesConfigEditor.this, "WaitForLoad", EditorMessages.FacesConfigEditor_WaitForLoad_EditorTabTitle); //$NON-NLS-1$
-
- try
- {
- addPage(0,_waitPage);
- }
- catch(PartInitException pie)
- {
- _waitPage =null;
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, pie.getMessage() == null ? "" : pie //$NON-NLS-1$
- .getMessage(), pie));
- }
- }
- }
-
- /**
- * Must be run on the UI thread
- */
- public void doRun(FacesConfigArtifactEdit edit)
- {
- synchronized(this)
- {
- // ensure wait page gets removed
- removeWaitPage();
-
- if (!getArePagesLoaded()
- && !_isDisposed) // NOTE: we assume that access to variable does not need to
- // to be synchronous since this method must
- // be run on the UI thread. The only way
- // that isDisposed should be true is if model loading took a long
- // time and the user closed the editor before it completed (trigger dispose to be called)
- {
- try
- {
- if (isWebProject && edit != null && edit.getFacesConfig() != null)
- {
- // only add the intro editor if the preference
- // is set to do so.
- if (GEMPreferences.getShowIntroEditor())
- {
- IntroductionPage page1 = new IntroductionPage(FacesConfigEditor.this);
- addPage(page1, null);
- }
-
- IFormPage overviewPage = new OverviewPage(FacesConfigEditor.this);
- addPage(overviewPage, null);
-
- // Page flow
- createAndAddPageflowPage();
-
- // pages
- IFormPage managedBeanPage = new ManagedBeanPage(FacesConfigEditor.this);
- managedBeanPageID = addPage(managedBeanPage, null);
- IFormPage componentsPage = new ComponentsPage(FacesConfigEditor.this);
- componentsPageID = addPage(componentsPage, null);
- IFormPage othersPage = new OthersPage(FacesConfigEditor.this);
- othersPageID = addPage(othersPage, null);
- }
-
- sourcePage = new StructuredTextEditor();
-
- sourcePage.setEditorPart(FacesConfigEditor.this);
-
- sourcePageId = addPage(sourcePage, FacesConfigEditor.this.getEditorInput());
- setPageText(sourcePageId,
- EditorMessages.FacesConfigEditor_Source_TabName);
- sourcePage.update();
-
- // default active page to 0
- setActivePage(0);
-
- // execute deferred runnables
- for (Runnable runnable : _deferredRunnables)
- {
- runnable.run();
- }
-
- // flag the fact that the regular editor pages have been added
- _arePagesLoaded.set(true);
- } catch (PartInitException e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, e.getMessage() == null ? "" : e //$NON-NLS-1$
- .getMessage(), e));
- }
- }
- }
- }
- }
-
- /**
- * Creates the pageflow page of the multi-page editor.
- * @throws PartInitException
- */
- protected void createAndAddPageflowPage() throws PartInitException {
- pageflowPage = new PageflowEditor(this);
- pageflowPageID = addPage(pageflowPage, getEditorInput());
- setPageText(pageflowPageID,
- EditorMessages.FacesConfigEditor_Pageflow_TabName);
- 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);
- }
-
- /**
- * TODO: this is used only for testing
- * @return the page flow editor
- */
- public PageflowEditor getPageflowPage() {
- return pageflowPage;
- }
-
- /**
- * get the action's registry of sub pages.
- * @param page
- *
- */
- 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. Should not, but may return null.
- */
- public FacesConfigType getFacesConfig()
- {
- FacesConfigArtifactEdit edit = _modelLoader.getEdit();
- if (edit != null)
- {
- return edit.getFacesConfig();
- }
- return null;
- }
-
- /*
- * @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
- * @param editor
- */
- 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) {
- // do nothing
- }
-
- /** 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(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(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 {
- if (isWebProject &&
- _modelLoader.getEdit() != null) {
- // modelResource.save(Collections.EMPTY_MAP);
- _modelLoader.getEdit()
- .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 //$NON-NLS-1$
- .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));
- }
- }
- }
-
- /**
- * @param uri
- * @param editorInput
- */
- protected void doSaveAs(URI uri, IEditorInput editorInput) {
- 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() {
- 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()) || !isWebProject || !_addPagesTask.getArePagesLoaded()) {
- 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(final IMarker marker) {
- // this may be called on an editor open (i.e. double-click the Problems view)
- // so ensure it runs safely with respect to the page load
- _addPagesTask.pageSafeExecute(new Runnable()
- {
- public void run()
- {
- 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) {
- IDocument doc = sourcePage.getDocumentProvider().getDocument(getEditorInput());
- if (doc instanceof IStructuredDocument) {
- IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(doc);
- if (model == null) {
- model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) doc);
- }
- sourceCommandStack = new EMFCommandStackGEFAdapter(
- (BasicCommandStack) model.getUndoManager()
- .getCommandStack());
- }
- else
- {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(), 0,
- "Error getting undo stack for Faces Config editor. Undo may be disabled", //$NON-NLS-1$
- new Throwable()));
- }
- }
- 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()
- {
- // signal that we have been disposed
- // do this before anything else
- _isDisposed = true;
- _modelLoader.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 IProject
- */
- public IProject getProject() {
- if (currentProject == null) {
- if (_modelLoader.getEdit() != null) {
- IFile file = _modelLoader.getEdit().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));
- }
- }
-
- private void gotoMarker(IMarker marker) {
- setActivePage(sourcePageId);
- IDE.gotoMarker(this.sourcePage, marker);
- }
-
- /**
- * FIXME: this is used only for testing. Should isolate better
- * @return the action bar
- */
- public FacesConfigActionBarContributor getActionBarContributor() {
- return (FacesConfigActionBarContributor) getEditorSite()
- .getActionBarContributor();
- }
-
- private IActionBars getActionBars() {
- return getActionBarContributor().getActionBars();
- }
-
- /**
- * Shows a dialog that asks if conflicting changes should be discarded.
- * @return the user's response.
- */
- protected boolean handleDirtyConflict() {
- return MessageDialog
- .openQuestion(
- getSite().getShell(),
- EditorMessages.FacesConfigEditor_ErrorHandlingUndoConflicts_DialogTitle,
- EditorMessages.FacesConfigEditor_ErrorHandlingUndoConflicts_DialogMessage);
- }
-
- /**
- * 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 //$NON-NLS-1$
- .getMessage(), exception));
- }
- }
- }
- }
- }
-
- /**
- * TODO this is used only for testing. Should be able to remove if we
- * go to true automated UI testing
- * @param pageID
- */
- 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);
- }
- }
-
- private boolean matches(IEditorInput input) {
- final IResource file = (IResource) input.getAdapter(IResource.class);
- boolean hasWebFacet = false;
- boolean hasJSFFacet = false;
-
- if (file != null) {
- final IProject project = file.getProject();
-
- if (project != null) {
- try {
- final IFacetedProject facetedProject = ProjectFacetsManager
- .create(project);
-
- if (facetedProject != null) {
- final Set facets = facetedProject.getProjectFacets();
-
- for (final Iterator it = facets.iterator(); it
- .hasNext();) {
- final IProjectFacetVersion version = (IProjectFacetVersion) it
- .next();
-
- IProjectFacet facet = version.getProjectFacet();
- if (IJSFCoreConstants.JSF_CORE_FACET_ID.equals(facet.getId())) {
- hasJSFFacet = true;
- } else if ("jst.web".equals(facet.getId())) { //$NON-NLS-1$
- hasWebFacet = true;
- }
- }
- }
- } catch (CoreException ex) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK,
- ex.getMessage() == null ? "" : ex //$NON-NLS-1$
- .getMessage(), ex));
- }
- }
- }
-
- return hasWebFacet && hasJSFFacet;
- }
-
- /**
- * DANGER! This call is for testing only! Should not be used,
- * even internally, by production code.
- * @param timeoutMs the time to wait in milliseconds
- * @throws InterruptedException
- */
- public void doPageLoad(long timeoutMs) throws InterruptedException
- {
- _modelLoader.waitForLoad(timeoutMs);
- _addPagesTask.doRun(_modelLoader.getEdit());
- }
-}
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 f50fc573a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java
+++ /dev/null
@@ -1,22 +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;
-
-/**
- * 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/ModelLoader.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/ModelLoader.java
deleted file mode 100644
index 417b949b3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/ModelLoader.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Centralizes logic to load the faces config model off of the UI thread for
- * the FacesConfig Editor.
- *
- * Also encapsulates the lifecycle for the instance of the faces artifact
- * created for its editor. All creation, access and destruction of the artifact
- * should be centralized through this class
- *
- * @author cbateman
- *
- */
-class ModelLoader
-{
- private FacesConfigArtifactEdit _edit;
- private Job _loadModelJob;
- private CountDownLatch _modelLoaded = new CountDownLatch(1);
-
- /**
- * @return the artifact edit or null if not loaded. Should only be called
- * after load() is called and has executed its callback
- */
- public synchronized FacesConfigArtifactEdit getEdit() {
- return _edit;
- }
-
- private synchronized void setEdit(FacesConfigArtifactEdit edit)
- {
- _edit = edit;
- }
-
- void waitForLoad(long timeoutMs) throws InterruptedException
- {
- _modelLoaded.await(timeoutMs, TimeUnit.MILLISECONDS);
- }
-
- /**
- * Dispose of the model and any unfinished loading operations
- *
- * Must be run on the UI thread.
- */
- public synchronized void dispose()
- {
- assertOnDisplayThread();
-
- // if the load model job has not completed, cancel it
- if (_loadModelJob != null
- && _loadModelJob.getResult() == null)
- {
- _loadModelJob.cancel();
- }
-
- if (_edit != null)
- {
- _edit.dispose();
- //System.out.println("FacesConfigEditor.dispose(): isDisposed == "+_edit.isDisposed());
- }
- }
-
- /**
- * Load the model file located by path in project. Must be called from the UI thread.
- *
- * Method does not block.
- *
- * @param project
- * @param path
- * @param isWebProject
- * @param signalComplete to be asyncExec'd on the UI thread when the model is loaded
- */
- public void load(final IProject project, final IPath path, final boolean isWebProject, final ModelLoaderComplete signalComplete)
- {
- assertOnDisplayThread();
- _loadModelJob = new ModelLoaderJob(project, path, isWebProject, signalComplete);
- _loadModelJob.schedule();
- }
-
- private class ModelLoaderJob extends Job
- {
- private final IProject _project;
- private final IPath _path;
- private final ModelLoaderComplete _runnable;
- private final boolean _isWebProject;
-
- ModelLoaderJob(final IProject project, final IPath path, final boolean isWebProject, final ModelLoaderComplete signalComplete)
- {
- super(EditorMessages.ModelLoader_LoadingModelJobName);
- _project = project;
- _path = path;
- _runnable = signalComplete;
- _isWebProject = isWebProject;
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- FacesConfigArtifactEdit artifactEdit = loadModel(_project, _path);
-
- // synchrnoize on the ModelLoader. Ensure that any call to dispose()
- // that occurs before we set the edit is done atomically.
- synchronized(ModelLoader.this)
- {
- // only bother with this if the task hasn't been signalled for cancel
- if (!monitor.isCanceled())
- {
- setEdit(artifactEdit);
-
- _runnable.setFacesConfigArtifactEdit(artifactEdit);
-
- // finish as quickly possible; we are holding the ModelLoader
- // lock so we must ensure that we don't block.
- // NEVER USE syncExec here.
- PlatformUI.getWorkbench().getDisplay().asyncExec(_runnable);
- }
- // if we were cancelled, then dispose of the artifact edit
- else
- {
- if (artifactEdit != null)
- {
- artifactEdit.dispose();
- }
- }
- }
-
- // signal that we are done loading
- _modelLoaded.countDown();
- return Status.OK_STATUS;
- }
-
- /**
- * Loads the configuration model from the given path.
- *
- */
- private FacesConfigArtifactEdit loadModel(IProject project, IPath modelPath)
- {
- if (_isWebProject)
- {
- 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());
- }
-
-
- return FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForWrite(project, relativePath
- .toString());
- }
-
- return null;
- }
- }
-
- abstract static class ModelLoaderComplete implements Runnable
- {
- private FacesConfigArtifactEdit _edit;
-
- private void setFacesConfigArtifactEdit(FacesConfigArtifactEdit edit)
- {
- _edit = edit;
- }
-
- public final void run()
- {
- assertOnDisplayThread();
- doRun(_edit);
- }
-
- /**
- * Called by the runnable. Implementer should _not_ cache the edit variable
- * edit may be null
- *
- * @param edit
- */
- protected abstract void doRun(FacesConfigArtifactEdit edit);
- }
-
- private static void assertOnDisplayThread()
- {
- if (Thread.currentThread() != PlatformUI.getWorkbench().getDisplay().getThread())
- {
- throw new IllegalStateException("ModelLoaderComplete must be called on the UI thread"); //$NON-NLS-1$
- }
- }
-}
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 90e5cae8d..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.common.ui.internal.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(ListenerList.IDENTITY);
-
- /** 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);
- }
- 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 rec
- * 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) {
- // do nothing: no handling of default selected event
- }
-}
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 93eb8e44e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java
+++ /dev/null
@@ -1,63 +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.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 MyEditingDomainActionContributor() {
- super();
- }
-
- public void setActiveEditor(IEditorPart part) {
- if (getActiveEditor() != null) {
- deactivate();
- }
- super.setActiveEditor(part);
- IActionBars actionBars = getActionBars();
- actionBars.clearGlobalActionHandlers();
- if (part instanceof IEditingDomainProvider) {
- 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);
- 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 9b459e85e..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 selectionProvider1) {
-
- parentSite.registerContextMenu(menuId, menuManager, selectionProvider1);
- }
-
- /*
- * (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 055fffc67..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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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 5b5a1f025..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.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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 aa5aa2104..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
+++ /dev/null
@@ -1,497 +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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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(EditorMessages.AddEditManagedPropertyDialog_Add);
- else
- newShell.setText(EditorMessages.AddEditManagedPropertyDialog_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);
- 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 = ""; //$NON-NLS-1$
- valueField.getTextControl(null, parent).setEditable(true);
- valueField.setEnabled(true);
- }
- }
-
- /**
- * @param valueType_
- * @param value
- */
- 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 = 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 = 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 7586e7333..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.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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 5d80eecc2..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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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 1c0d3b613..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
+++ /dev/null
@@ -1,270 +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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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;
-
- /**
- * @param parentShell
- * @param page
- * @param isNew
- */
- public AddEditRendererDialog(Shell parentShell, IFacesConfigPage page,
- boolean isNew) {
- super(parentShell);
- this.page = page;
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param rendererName
- * @param rendererClass
- * @param componentFamily
- * @param renderType
- */
- 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);
- }
-
- /**
- * @return the associated project
- */
- 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 75dd0bc20..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.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.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.common.ui.internal.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
- * @return the structured viewer
- */
- 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_) {
- // do nothing; sub-classes should override
- }
-
- //TODO: why bother with this interface?
- public void selectionChanged(SelectionChangedEvent event) {
- // selectionChanged not handled
-
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // do nothing; not handling setSelection
- }
-
- public ISelection getSelection() {
- return structuredViewer.getSelection();
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // do nothing; not handling setSelection
- }
-
- public void setSelection(ISelection selection) {
- // do nothing; not handling change in selection
- }
-
- /**
- * 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 d8c561826..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.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.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.common.ui.internal.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 = JavaUIHelper
- .openSelectionDialog(shell, project, superType, tyle);
-
- // dialog could be null
- if (dialog != null)
- {
- 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 b89a83b16..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
+++ /dev/null
@@ -1,399 +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.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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-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 listEntries
- * the list-entries element that working on.
- * @param section
- */
- 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 d03570a3b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
+++ /dev/null
@@ -1,433 +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.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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-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 c6cdbb696..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.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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 e91881bb0..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.common.ui.internal.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 576401381..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
+++ /dev/null
@@ -1,181 +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.common.ui.internal.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;
- }
- 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 d4e34d862..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.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.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 0f18361f9..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.common.ui.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 1b4a7747e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
+++ /dev/null
@@ -1,286 +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 {
-
- /**
- * The id of this page in the faces-config editor.
- */
- 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 = getFacesConfigMasterSections()[0];
- } else if (FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(component)) {
- section = getFacesConfigMasterSections()[1];
- } else if (FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(component)) {
- section = getFacesConfigMasterSections()[2];
- } else if (FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(component)) {
- section = getFacesConfigMasterSections()[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 8a8224005..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java
+++ /dev/null
@@ -1,383 +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");
-
- private 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 the detail sections
- */
- 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 the master section
- */
- 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) {
- 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) {
- // no selection setting
- }
-
- 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 42afa4ff8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java
+++ /dev/null
@@ -1,43 +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;
-
-/**
- * Implemented by IFormPage's that want to support EditorInput-like
- * model set/get/refresh
- *
- * @author sfshi
- *
- */
-public interface IFacesConfigPage extends IFormPage {
-
- /**
- * Set the input. Implementer may choose to ignore
- *
- * @param input
- */
- void setInput(Object input);
-
- /**
- * @return the input or null if none set
- */
- Object getInput();
-
- /**
- * signal to a form page that the data in its input has changed
- * and it should refresh its view.
- */
- 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 3b12b6a13..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.common.ui.internal.guiutils.IntroductionSection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-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 cc092c041..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
+++ /dev/null
@@ -1,198 +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 {
-
- /**
- * The id of this page in the faces-config editor.
- */
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage";
-
- private IContentOutlinePage contentOutlinePage;
-
- /**
- * @param editor
- */
- 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) getFacesConfigMasterSections()[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 b0026c941..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
+++ /dev/null
@@ -1,763 +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 {
-
- /**
- * The id of this page in the faces-config editor.
- */
- 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;
- }
-
- /**
- * Reset the editor input for the application section
- */
- public void resetApplicationInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForApplicationSections((FacesConfigType) getInput());
- }
- }
-
- /**
- * Reset the editor input for the factory sections
- */
- public void resetFactoryInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForFactorySections((FacesConfigType) getInput());
- }
- }
-
- /**
- * Reset the editor input for the lifecycle section
- */
- public void resetLifecycleInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForLifecycleSections((FacesConfigType) getInput());
- }
- }
-
- /**
- * Sets the model for all Application sub-model elements to facesConfig
- * @param facesConfig
- */
- 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);
- }
- }
-
- /**
- * Sets the model for all Factory sub-model elements to facesConfig
- * @param facesConfig
- */
- 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);
- }
- }
-
- /**
- * Sets the model for all Lifecycle sub-model elements to facesConfig
- * @param facesConfig
- */
- 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 the page section
- */
- 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 adab23118..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
+++ /dev/null
@@ -1,233 +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 {
-
- private static final int LAYOUT_MARGIN_HEIGHT = 2;
-
- private 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", EditorMessages.OverviewPage_page_name);
- }
-
- /*
- * (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);
- }
- }
-
- /**
- * Call refreshAll on all sections on this page
- */
- 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) {
- // do not support change in selection
- }
-
- /*
- * (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) {
- // do not support change in selection
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // do not support change in selection
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java
deleted file mode 100644
index 1b201600f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 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
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-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.ScrolledForm;
-
-/**
- * A page the exists only be used before the editor's model is fully loaded
- * as a status placeholder while the user waits.
- *
- * @author cbateman
- *
- */
-public class WaitForLoadPage extends FormPage
-{
-
- /**
- * @param editor the parent
- * @param id the id of the editor within its parent
- * @param title the title displayed to the user on the editor's tab
- */
- public WaitForLoadPage(FormEditor editor, String id, String title) {
- super(editor, id, title);
- }
-
- @Override
- protected void createFormContent(IManagedForm managedForm) {
- // get the form
- ScrolledForm form = managedForm.getForm();
- //FormToolkit toolkit = getEditor().getToolkit();
- form.setText(EditorMessages.FacesConfigEditor_WaitForLoadPage_Title);
- }
-
-}
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 eec368ac5..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java
+++ /dev/null
@@ -1,185 +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();
-
- /**
- * @param page
- */
- 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 the detail sections
- */
- 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);
- }
- }
-
- }
-
- /**
- * @return the master/detail page for this page
- */
- 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) {
- selectionChangedListeners.add(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) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // no selection allowed
- }
-
-}
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 1bef22f38..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java
+++ /dev/null
@@ -1,374 +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.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;
-
-/**
- * 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;
-
- /** the current ZoomManager all work is delegated to */
- private ZoomManager currentZoomManager = null;
-
- /** listeners of zoom */
- private ListenerList zoomListeners = new ListenerList(
- ListenerList.IDENTITY);
-
- /**
- * 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 9f9a081af..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() {
- // do nothing
- }
-
- 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 1efb7434e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java
+++ /dev/null
@@ -1,1216 +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.FontRegistry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-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.common.ui.internal.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.graphics.FontData;
-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(this));
-
- // Allows showing property view for the pageflow
- SelectionAction action = new ShowPropertyViewAction(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 file
- *
- * @param progressMonitor
- * @throws CoreException
- */
- 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(e);
- } catch (IOException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- EditorPlugin.getAlerts().throwCoreException(e);
- }
- }
-
- /*
- * (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
- */
- 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 = getLinkLabelFont();
- 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 = getNodeLabelFont();
- 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;
- else if (GEMPreferences.LABEL_PLACEMENT_BOTTOM
- .equals(nodeLabelPlacement))
- placement = PositionConstants.SOUTH;
- else if (GEMPreferences.LABEL_PLACEMENT_LEFT
- .equals(nodeLabelPlacement))
- placement = PositionConstants.WEST;
- else if (GEMPreferences.LABEL_PLACEMENT_RIGHT
- .equals(nodeLabelPlacement))
- placement = PositionConstants.EAST;
- if (part instanceof INodePreference)
- ((INodePreference) part).setTextPlacement(placement);
- }
- }
-
- private Font getLinkLabelFont() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.LINE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- private Font getNodeLabelFont() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.FIGURE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- /*
- * (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().getContributor().getName(),
- iconPath);
- }
- }
- }
- 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/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 3e239190d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java
+++ /dev/null
@@ -1,242 +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
- * 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
- * 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
- */
- // TODO: dead code
-// 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
- */
- // TODO: dead code
-// 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 2f036ad0d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java
+++ /dev/null
@@ -1,545 +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.
- *
- */
- 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) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#partDeactivated(org.eclipse.gef.EditPart)
- */
- public void partDeactivated(EditPart editpart) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#removingChild(org.eclipse.gef.EditPart,
- * int)
- */
- public void removingChild(EditPart child, int index) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#selectedStateChanged(org.eclipse.gef.EditPart)
- */
- public void selectedStateChanged(EditPart editpart) {
- // do nothing
- }
- }
-
- /**
- * 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 64b31a60d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.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.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;
-
- public static String PageflowLinkEditPart_FromAction;
-
- public static String PageflowLinkEditPart_FromOutcome;
-}
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 ece46896c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
+++ /dev/null
@@ -1,146 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-####################################################
-# 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:
-
-PageflowLinkEditPart_FromAction=fromAction:
-PageflowLinkEditPart_FromOutcome=fromOutcome:
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 f9ca21595..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java
+++ /dev/null
@@ -1,211 +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.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(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 e108d8e55..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java
+++ /dev/null
@@ -1,329 +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.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.jst.jsf.facesconfig.ui.EditorMessages;
-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(EditorMessages.AlignmentAction_AlignLeftAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignLeftAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
- break;
-
- case PositionConstants.RIGHT:
- setId(GEFActionConstants.ALIGN_RIGHT);
- setText(EditorMessages.AlignmentAction_AlignRightAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignRightAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
- break;
-
- case PositionConstants.TOP:
- setId(GEFActionConstants.ALIGN_TOP);
- setText(EditorMessages.AlignmentAction_AlignTopAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignTopAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
- break;
-
- case PositionConstants.BOTTOM:
- setId(GEFActionConstants.ALIGN_BOTTOM);
- setText(EditorMessages.AlignmentAction_AlignBottomAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignBottomAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
- break;
-
- case PositionConstants.CENTER:
- setId(GEFActionConstants.ALIGN_CENTER);
- setText(EditorMessages.AlignmentAction_AlignCenterAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignCenterAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
- break;
-
- case PositionConstants.MIDDLE:
- setId(GEFActionConstants.ALIGN_MIDDLE);
- setText(EditorMessages.AlignmentAction_AlignMiddleAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_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/InternalImages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/InternalImages.java
deleted file mode 100644
index 8daa9ba7a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/InternalImages.java
+++ /dev/null
@@ -1,101 +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.facesconfig.ui.pageflow.action;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * Supplies image descriptors, intended for internal use only.
- *
- * @author Ian Trimble - Oracle
- */
-public class InternalImages {
-
- /**
- * ImageDescriptor instance for center alignment image.
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_CENTER;
-
- /**
- * ImageDescriptor instance for left alignment image.
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_LEFT;
-
- /**
- * ImageDescriptor instance for right alignment image.
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_RIGHT;
-
- /**
- * ImageDescriptor instance for middle alignment image.
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_MIDDLE;
-
- /**
- * ImageDescriptor instance for top alignment image.
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_TOP;
-
- /**
- * ImageDescriptor instance for bottom alignment image.
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_BOTTOM;
-
- /**
- * ImageDescriptor instance for center alignment image (disabled).
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_CENTER_DIS;
-
- /**
- * ImageDescriptor instance for left alignment image (disabled).
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_LEFT_DIS;
-
- /**
- * ImageDescriptor instance for right alignment image (disabled).
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_RIGHT_DIS;
-
- /**
- * ImageDescriptor instance for middle alignment image (disabled).
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_MIDDLE_DIS;
-
- /**
- * ImageDescriptor instance for top alignment image (disabled).
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_TOP_DIS;
-
- /**
- * ImageDescriptor instance for bottom alignment image (disabled).
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_BOTTOM_DIS;
-
- static {
- DESC_VERT_ALIGN_BOTTOM = createDescriptor("icons/alignbottom.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_CENTER = createDescriptor("icons/aligncenter.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_LEFT = createDescriptor("icons/alignleft.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_MIDDLE = createDescriptor("icons/alignmid.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_RIGHT = createDescriptor("icons/alignright.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_TOP = createDescriptor("icons/aligntop.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_BOTTOM_DIS = createDescriptor("icons/alignbottom_d.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_CENTER_DIS = createDescriptor("icons/aligncenter_d.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_LEFT_DIS = createDescriptor("icons/alignleft_d.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_MIDDLE_DIS = createDescriptor("icons/alignmid_d.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_RIGHT_DIS = createDescriptor("icons/alignright_d.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_TOP_DIS = createDescriptor("icons/aligntop_d.gif"); //$NON-NLS-1$
- }
-
- private static ImageDescriptor createDescriptor(String filename) {
- return ImageDescriptor.createFromFile(InternalImages.class, filename);
- }
-
-}
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 320660c5d..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.common.ui.internal.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/action/icons/alignbottom.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom.gif
deleted file mode 100644
index 9eea5581b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gif
deleted file mode 100644
index 1c62797ec..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gif
deleted file mode 100644
index 4e8c94a88..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gif
deleted file mode 100644
index ceeafb780..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gif
deleted file mode 100644
index 55cecc20e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gif
deleted file mode 100644
index 60fcc8f5c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gif
deleted file mode 100644
index 5f13c93d4..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gif
deleted file mode 100644
index 2f7534e6f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gif
deleted file mode 100644
index f6ead1580..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gif
deleted file mode 100644
index 0495ed5d6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gif
deleted file mode 100644
index 2f9ceeb11..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gif
deleted file mode 100644
index 9f1b49b1c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gif
+++ /dev/null
Binary files differ
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 4cd06f003..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 149da0bdd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java
+++ /dev/null
@@ -1,98 +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.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 27b1c183f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java
+++ /dev/null
@@ -1,148 +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() {
- // do nothing; sub-class can over-ride
- }
-
- /*
- * (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() {
- // do nothing
- }
-
- /**
- * 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 61a6c16bc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java
+++ /dev/null
@@ -1,39 +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.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 723e1fcf2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java
+++ /dev/null
@@ -1,252 +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.common.ui.internal.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(WebrootUtil.getJSPFileExtensions());
- 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 dd22437fd..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java
+++ /dev/null
@@ -1,47 +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;
-
-/**
- * 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 e0940623c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java
+++ /dev/null
@@ -1,190 +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.gef.commands.Command;
-import org.eclipse.jst.jsf.common.ui.internal.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.IEditorDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- *
- * This is the Command for opening a file in its default editor
- *
- * @author Xiao-guang Zhang
- */
-public class OpenEditorCommand extends 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.
- *
- */
- 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) {
- final IFile file = (IFile) workspaceRoot
- .findMember(resourcePath);
- openExistingJSFFile(file);
- } else {
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle =
- // Open JSF File Error
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo =
- // Cannot open the page in the page editor.
- 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() {
- IDE.setDefaultEditor(file, null);
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IEditorDescriptor desc = IDE.getEditorDescriptor(file);
- page.openEditor(new FileEditorInput(file),
- desc.getId(), true, IWorkbenchPage.MATCH_INPUT
- | IWorkbenchPage.MATCH_ID);
- } 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 510357c33..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java
+++ /dev/null
@@ -1,111 +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.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 e3e526920..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.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.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 node
- * 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 2c489f855..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 marker resource
- */
- 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 3a2a3f938..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.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.pageflow.editpart;
-
-
-/**
- * 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 org.eclipse.draw2d.PositionConstants#EAST}. Other possible values are
- * {@link org.eclipse.draw2d.PositionConstants#NORTH}, {@link org.eclipse.draw2d.PositionConstants#SOUTH} and
- * {@link org.eclipse.draw2d.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 769866627..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java
+++ /dev/null
@@ -1,137 +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.isDisposed()) {
- 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 = getEditPart().getFigure();
- final Font figureFont = figure.getFont();
- // take a copy of the font data for the label we are cell editing
- FontData data = figureFont.getFontData()[0];
- Dimension fontSize = new Dimension(0, data.getHeight());
- label.translateToAbsolute(fontSize);
- data.setHeight(fontSize.height);
-
- if (scaledFont != null && !scaledFont.isDisposed())
- {
- scaledFont.dispose();
- }
- scaledFont = new Font(figureFont.getDevice(), 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 0ff56f2e9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java
+++ /dev/null
@@ -1,387 +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.jface.text.source.Annotation;
-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.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 pageflow -
- * pageflow model
- */
- protected PageflowEditPart(Pageflow pageflow) {
- super(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 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
- * @return the router style value
- *
- */
- 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);
- }
-
- protected void performDirectEdit() {
- // do nothing
- }
-
- protected void performOpen() {
- // do nothing
- }
-
- public void addAnnotation(Annotation annotation) {
- // do nothing
-
- }
-
- public void removeAnnotation() {
- // do nothing
- }
-}
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 a3e32ff90..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java
+++ /dev/null
@@ -1,340 +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((Adapter) 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 abstract void performDirectEdit();
-
- /**
- * perform double click request
- *
- */
- protected abstract void performOpen();
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public abstract void addAnnotation(Annotation annotation);
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public abstract 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 15eb0fb02..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java
+++ /dev/null
@@ -1,476 +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.PageflowMessages;
-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() {
- StringBuffer tip = new StringBuffer();
- if (needDrawingAction()) {
- ((PFLinkFigure) getFigure()).setActionImage();
- tip.append(PageflowMessages.PageflowLinkEditPart_FromAction).append(
- ((PageflowLink) getModel()).getFromaction());
- } else if (((PFLinkFigure) getFigure()).getImage() != getImage(IMG_WARNING)) {
- ((PFLinkFigure) getFigure()).clearIcon();
- }
- if (needDrawingLabel()) {
- ((PFLinkFigure) getFigure()).setLabel(((PageflowLink) getModel())
- .getOutcome());
- if (tip.length() > 0)
- tip.append("\n");
- tip.append(PageflowMessages.PageflowLinkEditPart_FromOutcome).append(
- ((PageflowLink) getModel()).getOutcome());
- } else {
- ((PFLinkFigure) getFigure()).clearOutcome();
- }
- ((PFLinkFigure) getFigure()).setToolTipText(tip.toString());
- }
-
- /*
- * (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 8208cd2aa..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java
+++ /dev/null
@@ -1,479 +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.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 = ImageDescriptor.createFromImage(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;
- }
-
- /**
- * Computes adornment flags for specified object.
- *
- * Note: This method is for internal use only. Clients should not call
- * this method.
- *
- * @param obj Object to complute flags for.
- * @return Adornment flags.
- */
- protected int computeAdornmentFlags(Object obj) {
- return JavaElementImageDescriptor.WARNING;
- }
-
- /**
- * Disposes this instance.
- */
- 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;
- }
-
- }
-
- /**
- * Disposes this instance.
- */
- 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(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 = ((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 8b945157b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.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.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
- */
- 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 fb0465df2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java
+++ /dev/null
@@ -1,53 +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;
-
-/**
- * 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 fa5764d82..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.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.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();
- }
-
- /**
- * @param s
- */
- public NodeLabel(String s) {
- super(s);
- }
-
- /**
- * @param i
- */
- public NodeLabel(Image i) {
- super(i);
- }
-
- /**
- * @param s
- * @param i
- */
- public NodeLabel(String s, Image i) {
- super(s, i);
- }
-
- /*
- * (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 toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- /**
- * get tooltip's text
- *
- * @return the tool tip text string
- */
- 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 041fce3c8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java
+++ /dev/null
@@ -1,307 +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.FontRegistry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-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.FontData;
-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 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 image
- */
- 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();
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText()
- */
- public void setToolTipText(String text) {
- Label toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- /*
- * (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() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.LINE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- /*
- * (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();
- final Color newFgColor = GEMPreferences.getColor(store, GEMPreferences.LINE_COLOR);
- setForegroundColor(newFgColor);
- return newFgColor;
- }
-
- /**
- * 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 be73575be..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.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.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.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-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.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The figure for pageflow node, used by pageflow node edit part.
- *
- */
-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; // TODO: variable is never read because getter is private
-
- /** the text placement for the label */
- private int textPlacement = PositionConstants.SOUTH;
-
- 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;
- else if (GEMPreferences.LABEL_PLACEMENT_BOTTOM.equals(s))
- textPlacement = PositionConstants.SOUTH;
- else if (GEMPreferences.LABEL_PLACEMENT_LEFT.equals(s))
- textPlacement = PositionConstants.WEST;
- else if (GEMPreferences.LABEL_PLACEMENT_RIGHT.equals(s))
- textPlacement = PositionConstants.EAST;
- return textPlacement;
- }
-
- /**
- * get the label's background color from preference.
- *
- * @return
- */
- // TODO: dead code
-// 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() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.FIGURE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- /**
- * 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) {
-// TODO: var is never read: 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 toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- /*
- * (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 74c3470a9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java
+++ /dev/null
@@ -1,550 +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() {
- // no external instantiation
- }
-
- /**
- * 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 newPageflow
- * @param oldPageflow
- */
- 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
- */
- 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 d0fe7c62e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java
+++ /dev/null
@@ -1,290 +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)
- * @model default="" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='referenceLink'"
- * @generated
- */
- String getReferenceLink();
-
- /**
- * Sets the value of the '{@link 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 5d5f57a1f..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java
+++ /dev/null
@@ -1,308 +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.pageflow.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)
- * @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)
- * @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 efff345e1..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.core.runtime.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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 e78cf0910..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.core.runtime.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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 381e1d279..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 755c51401..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 eContainer.eInverseRemove(this,
- PageflowPackage.PF_LINK__BEND_POINTS, PageflowLink.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 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 d75ccedd2..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 eContainer.eInverseRemove(this,
- PageflowPackage.PAGEFLOW__LINKS, Pageflow.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 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 0e86e8706..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 eContainer.eInverseRemove(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.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 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 11d99e1e0..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 eContainer.eInverseRemove(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.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 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 72e08e6f8..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,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.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 the path
- */
- public static String resolvePath(EObject object) {
- if (object != null) {
- ((CompatibilityXMIResource) object.eResource())
- .setFormat(CompatibilityXMIResource.FORMAT_EMF1);
- String uriTarget = object.eResource().getURIFragment(object);
- return uriTarget;
- }
- 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 the resolved string
- */
- 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 the list of resolved paths for the data elements
- */
- 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 the list of elements
- */
- 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 the value for eFeature
- */
- 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 e24b2adf3..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 3a6309774..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
+++ /dev/null
@@ -1,367 +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.common.ui.internal.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.SelectionAdapter;
-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.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 SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- TableItem selItem = (TableItem) e.item;
- String action = selItem.getText(1);
- if (action != null && action.length() > 0)
- actionText.setText(action);
- }
- });
-
- 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, n = actionNodes.size(); i < n; i++) {
- Element node = (Element) actionNodes.get(i);
- StringBuffer componentName = new StringBuffer();
-
- Attr idAttr = node.getAttributeNode("id");
- if (idAttr != null)
- componentName.append(idAttr.getNodeValue());
-
- componentName.append("(").append(node.getTagName()).append(")"); //$NON-NLS-1$
-
- Attr actionAttr = node.getAttributeNode("action");
- if (actionAttr != null) {
- String action = actionAttr.getValue();
- if (isValidEL(action))
- addActionTableItem(componentName.toString(), 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))
- || (!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 217366634..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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
- *******************************************************************************/
-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 18f6c7770..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 f0d6442e1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.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.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 2a5e27dc1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.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.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 7ebd1e133..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.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.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.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,
- 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() {
- // do nothing
- }
-
- /*
- * (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 rec
- * a page record for the part
- */
- protected void doDestroyPage(IWorkbenchPart part, PageRec rec) {
- IPropertySheetPage page = 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());
- }
-}
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 51e42532c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java
+++ /dev/null
@@ -1,134 +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.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-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.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 ITextSelection) {
- return true;
- }
-
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return "";
- }
-
- public int getEnablesFor() {
- 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 25ee1779a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java
+++ /dev/null
@@ -1,476 +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
- */
- // TODO: method not used; dead?
-// 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",
- 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
- */
- // TODO: method not used; dead?
-// 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
- */
- // TODO: method not used; dead?
-// 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) {
- // do nothing
- }
-
- /*
- * (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 45a7b7574..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.common.ui.internal.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 b2a7b4ce1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 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
-###############################################################################
-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 a46eb1ce9..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.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.common.ui.internal.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 37d902d6c..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.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.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();
- }
-
- /**
- * TODO: this method seems unused
- */
- public abstract 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 != null
- && ((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 the command stack
- */
- public CommandStack getCommandStack() {
- return commandStack;
- }
-
- /**
- * get the property source registered for current editpart
- *
- * @return the property source
- */
- public IPropertySource getPropertySource() {
- return propertySource;
- }
-
- /**
- * get the property's EMF featureID based on property name.
- *
- * @param propertyName
- * @return the feature id for propertyName
- */
- 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;
- }
-
- /**
- * @return the property registry
- */
- protected Map getPropertyRegistry() {
- if (propertyRegistry == null) {
- propertyRegistry = new HashMap();
- }
- return propertyRegistry;
- }
-
- /**
- * get the input edit part
- *
- * @return the input
- */
- 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(
- 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 87d191e2a..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,86 +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.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(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);
-
- }
-
- /**
- * @param elem
- */
- 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 5f1d9c446..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,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.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.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);
- }
-
- public void validate() {
- // do nothing.
- }
-}
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 55218d12b..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,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.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.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;
- }
- 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 e223a7475..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,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.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.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);
- }
-
- public void validate() {
- // do nothing
- }
-
-}
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 bcaba514d..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,155 +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.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-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(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 65931743b..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,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.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.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);
- }
-
- public void validate() {
- // do nothing
- }
-}
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 334b5b418..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java
+++ /dev/null
@@ -1,268 +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.core.runtime.Assert;
-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.jst.jsf.common.ui.internal.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() {
- // can't set target so return null
- return null;
- }
-
- public void setTarget(Notifier newTarget) {
- // do nothing
- }
-
- 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);
- }
- }
-}
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 6814b90da..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java
+++ /dev/null
@@ -1,945 +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.core.runtime.Assert;
-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.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.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
- */
- // TODO: not used, dead?
-// 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, source, 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();
- if (rules != null) {
- 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();
- }
-
- /**
- * dispose of this object.
- */
- public void dispose() {
- clearCaches();
- Pageflow pageFlow = getPageflow();
-
- if (pageFlow != null)
- {
- pageFlow.dispose();
- }
- }
-
- public Notifier getTarget() {
- return null;
- }
-
- public boolean isAdapterForType(Object type) {
- return false;
- }
-
- public void setTarget(Notifier newTarget) {
- // do nothing
- }
-
- 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 the page flow page
- */
- 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
- *
- * @author sfshi
- * @return true if new rules were added
- */
- 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();
- 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 c446c0a66..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java
+++ /dev/null
@@ -1,215 +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.common.ui.internal.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));
- }
-}
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 a1e3c645b..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java
+++ /dev/null
@@ -1,216 +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
- * @throws CoreException
- */
- 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 model -
- * the model related with this edit part.
- * @param sMarkerType
- * @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 model -
- * the model related with this edit part.
- * @param sMarkerType -
- * the marker type, either IMarker.PROBLEM or IMarker.TASK
- * @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 0954c3c12..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java
+++ /dev/null
@@ -1,204 +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.common.ui.internal.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 the prefix
- */
- 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;
- }
-
-
- /**
- * signal we are done with the model
- */
- 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 a50fbd191..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
+++ /dev/null
@@ -1,185 +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
- * @param defaultPrefix
- * @return the prefix if model has one or the default
- */
- 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();
- }
-
- CMDocument cmdoc = tracker.getDocument();
- if (cmdoc instanceof TLDDocument
- && uri.equals(((TLDDocument) cmdoc).getUri())) {
- return tracker.getPrefix();
- }
- }
- return null;
- }
-
- /**
- * @param model
- * @param suggestion
- * @return the unsued prefix
- */
- 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 the uri corresponding to the prefix
- */
- 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();
- }
- return null;
- }
- }
- return null;
- }
-
- /**
- * get the action list in the jsp file
- * @param jspFileName
- *
- * @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 8da99bf53..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java
+++ /dev/null
@@ -1,256 +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
- */
-// FIXME: this appears to be a dead class.
-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;
- }
-
- /**
- * <!-- 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.
- * @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;
- }
-
- /**
- * <!-- 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.
- * @generated
- */
- public Adapter createPFBeginAdapter() {
- return null;
- }
-
- /**
- * <!-- 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.
- * @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 e09795a11..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java
+++ /dev/null
@@ -1,278 +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$
- }
-
- /**
- * Uses lazy initialization.
- *
- * @param path -
- * pageflow file name
- * @return the resource containing the pageflow
- */
- public Resource getResource(IPath path) {
- if (resourcePageflow == null) {
- pathPageflow = path;
- ResourceSet resSet = getResourceSet();
- resourcePageflow = resSet.getResource(URI.createPlatformResourceURI(path
- .toString()), true);
- }
-
- return resourcePageflow;
- }
-
- /**
- *
- * @return the top level pageflow model
- */
- 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.createPlatformResourceURI(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) {
- getResource(path);
- }
-
- /**
- * reloads the content of the model from the file.
- *
- * @param path
- */
- public void reload(IPath path) {
- 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;
- }
-
- /**
- * @param webPath
- * @return found page node according the web path.
- */
- 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 the ipath
- */
- 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 305f7b518..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;
- }
-
- 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 944ee4460..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java
+++ /dev/null
@@ -1,249 +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(EObject)} 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);
- }
- 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 42e49e776..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() {
- // no external instantiation
- }
-
- /**
- * get the singleton instance of pageflow validation
- *
- * @return the singleton instance of pageflow validation
- */
- 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 true if page exists (?)
- */
- 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 true if pageflow's path is equal to pagePath
- */
- 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 page
- * @return the notify message for page
- */
- 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 the managed bean name
- */
- 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 301d6fe25..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.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() { Font localFont = getLocalFont(); if (localFont == null) { localFont = JFaceResources.getFontRegistry().get( JFaceResources.DEFAULT_FONT); // TODO: it's not clear that setFont is correct to call // here since this does a revalidate if the font changes // whereas the deprecated assignment to font that it replaces // does not setFont(localFont); } return localFont; } /** * * @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 org.eclipse.draw2d.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 2dbcbd853..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java
+++ /dev/null
@@ -1,923 +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;
-
-/**
- * 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 text
- * the description to use for this node's tool tip
- *
- * @see 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 2bd8d2390..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.core.runtime.Assert; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.FieldEditor; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.resource.StringConverter; 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 { private static final int NUM_CONTROLS_WHEN_PREVIEWER = 4; private static final int NUM_CONTROLS_WHEN_NO_PREVIEWER = 3; /** * * 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; private Color color; 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.isDisposed()) font.dispose(); font = new Font(text.getDisplay(), fontData); text.setFont(font); } public void setRGB(RGB fontRGB) { if (fontRGB != null) { if (color != null && !color.isDisposed()) color.dispose(); color = new Color(null, fontRGB); text.setForeground(color); } } public int getPreferredExtent() { return 40; } } /** * * Creates a new font field editor * */ protected ColorFontFieldEditor() { // control instantiation } /** * * 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(); /* TODO: this constant is deprecated IDialogConstants.BUTTON_HEIGHT but == 14*/ // C.B: I think the correct thing to do is simply to remove this code, since // the deprecation mechanism says that button height is now determined by layout, // so setting a heightHint prob won't do anything anyway. // gd.heightHint = convertVerticalDLUsToPixels(changeFontButton, // 14 ); 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 NUM_CONTROLS_WHEN_NO_PREVIEWER; } return NUM_CONTROLS_WHEN_PREVIEWER; } /** * * 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().filterData( 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) { ColorRegistry registry = JFaceResources.getColorRegistry(); Color color = registry.get(fontRGB.toString()); if (color == null) { registry.put(fontRGB.toString(), fontRGB); color = registry.get(fontRGB.toString()); } valueControl.setForeground(color); } 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 cb344b36e..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.core.runtime.Assert; import org.eclipse.jface.preference.FieldEditor; 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 6ddceb61f..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 the window figure
- */
- 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 81cfa2626..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() { // no external instantiation } 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 781254c77..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java
+++ /dev/null
@@ -1,718 +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.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.resource.ColorRegistry;
-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.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.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
- /**
- * Key for preference for whether or not the intro editor should be shown
- */
- public final static String SHOW_INTRO_EDITOR = "ShowIntroEditor"; //$NON-NLS-1$
-
- 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"; //$NON-NLS-1$
-
- public final static String INPUT_PORT_COLOR = "InputPortColor"; //$NON-NLS-1$
-
- public final static String OUTPUT_PORT_COLOR = "OutputPortColor"; //$NON-NLS-1$
-
- public final static String SHOW_LINE_LABELS = "ShowLineLabels"; //$NON-NLS-1$
-
- 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"; //$NON-NLS-1$
-
- public final static String LABEL_PLACEMENT_BOTTOM = "Bottom"; //$NON-NLS-1$
-
- public final static String LABEL_PLACEMENT_LEFT = "Left"; //$NON-NLS-1$
-
- public final static String LABEL_PLACEMENT_RIGHT = "Right"; //$NON-NLS-1$
-
- // "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"; //$NON-NLS-1$
-
- // "Manual" routing allows user to create bendpoints
- public final static String LINE_ROUTING_MANUAL = "Manaul"; //$NON-NLS-1$
-
- 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;
-
- /**
- * @param name
- * @param label
- * @param parent
- */
- public BooleanField(String name, String label, Composite parent) {
- super(name, label, parent);
- this.parent = parent;
- }
-
- /**
- * @return the change control button
- */
- public Button getButton() {
- return getChangeControl(parent);
- }
- }
-
- /**
- * Constructor
- */
- public GEMPreferences() {
- super(GRID);
- // FIXME: we should be encapsulating what pref store is used for all callers of this class
- setPreferenceStore(EditorPlugin.getDefault().getPreferenceStore());
- setDescription(PreferenceMessages.GEMPreferences_description);
- initializeDefaults();
- }
-
- /**
- * Sets the default values of the preferences.
- */
- private void initializeDefaults() {
- IPreferenceStore store = getPreferenceStore();
- Font f = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- store.setDefault(SHOW_INTRO_EDITOR, true);
- 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() {
-
- // note, we aren't saving the reference. It's assumed that parent
- // worries about destruction, persistence etc.
- addBooleanField(
- SHOW_INTRO_EDITOR,
- PreferenceMessages.EditorPreferences_LABEL_ShowIntroEditor,
- getFieldEditorParent());
-
- 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) {
- // no initialization
- }
-
- private ColorFieldEditor addColorField(String name, String labelText,
- Composite parent) {
- ColorFieldEditor f = new ColorFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- private ComboFieldEditor addComboField(String name, String labelText,
- String[][] entryNamesAndValues, Composite parent) {
- ComboFieldEditor f = new ComboFieldEditor(name, labelText,
- entryNamesAndValues, parent);
- addField(f);
- return f;
- }
-
- private IntegerFieldEditor addIntegerField(String name, String labelText,
- Composite parent) {
- IntegerFieldEditor f = new IntegerFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- private BooleanField addBooleanField(String name, String labelText,
- Composite parent) {
- BooleanField f = new BooleanField(name, labelText, parent);
- addField(f);
- return f;
- }
-
-// private 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;
- // }
-
- private ColorFontFieldEditor addFontField(String name, String labelText,
- Composite parent) {
- ColorFontFieldEditor f = new ColorFontFieldEditor(name, labelText,
- parent);
- addField(f);
- return f;
- }
-
- private static String[][] getLineRoutingLabels() {
- return m_lineRoutingLabels;
- }
-
- private static String[][] getLabelPlacementLabels() {
- return m_labelPlacementLabels;
- }
-
-// private 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);
-// }
-// }
-
- /**
- * @return true if the preference is set to show the introduction
- * editor. false otherwise.
- */
- public static boolean getShowIntroEditor()
- {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- return store.getBoolean(SHOW_INTRO_EDITOR);
- }
-
- /**
- * @param store
- * @param property
- * @return the color property for the key 'property'
- */
- 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);
- ColorRegistry registry = JFaceResources.getColorRegistry();
- if (registry.get(rgb.toString()) != null)
- return registry.get(rgb.toString());
- registry.put(rgb.toString(), rgb);
- c = registry.get(rgb.toString());
- }
- return c;
- }
-
-// // CR392586: resource leaks
-// private static Font getFont(IPreferenceStore store, String property) {
-// FontData fd = PreferenceConverter.getFontData(store, property);
-// FontRegistry registry = JFaceResources.getFontRegistry();
-// if (!registry.get(fd.toString()).equals(registry.defaultFont()))
-// return registry.get(fd.toString());
-//
-// registry.put(fd.toString(), new FontData[] {fd});
-// return registry.get(fd.toString());
-// }
-
-// private 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 9c06a6813..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java
+++ /dev/null
@@ -1,399 +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 name
- * @param icon
- */
- 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 (getLocalFont() == null)
- {
- // TODO: replaced a deprecated assignment to font
- // with this, but the behaviour is a little different
- setFont(defaultFont);
- }
-
- return getLocalFont();
- }
-
- public void setFont(Font f) {
- Font localFont = getLocalFont();
- if (localFont != f) {
- iconLabel.setFont(f);
- }
- super.setFont(f);
- }
-
- 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 toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- 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 60a9fcad8..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 70b72e212..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 org.eclipse.draw2d.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 3444ffbc8..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 2d7f25237..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java
+++ /dev/null
@@ -1,202 +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.osgi.util.NLS;
-
-/**
- * The NLS message manager for PreferenceMessages
- *
- */
-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);
- }
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_UseSystemColors;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_BackgroundColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_Canvas;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_GridHeight;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_GridLineColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_GridWidth;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_IconLabelFont;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_IconGroup;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_InputPortColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_OutputPortColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineGroup;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_ShowLineLabels;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineLabelColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineLabelFont;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineRouting;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineWidth;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_SnapToGeometry;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_SnapToGrid;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_UndoStackSize;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Direct;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Manhattan;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Manual;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LabelPlacement;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Top;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Bottom;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Left;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Right;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_IconSize;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Small;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Medium;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Large;
-
- /**
- * label property for check box that selects whether or not
- * the introduction section editor should be loaded.
- */
- public static String EditorPreferences_LABEL_ShowIntroEditor;
-
- public static String GEMPreferences_description;
-
-}
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 a65ffd1ec..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 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
-###############################################################################
-#
-# Appearance preference labels
-#
-CanvasPreferenceTab_LABEL_UseSystemColors=Use System colors
-EditorPreferences_LABEL_ShowIntroEditor=Show Introduction Tab (open editors must be reloaded to take effect)
-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
-GEMPreferences_description=Preferences for the graphical page of FacesConfig editor.
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 5bd3f1cba..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java
+++ /dev/null
@@ -1,169 +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.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 org.eclipse.draw2d.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 068c89f4d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java
+++ /dev/null
@@ -1,35 +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 81114276d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java
+++ /dev/null
@@ -1,463 +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.core.runtime.ListenerList;
-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.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) {
- // do nothing: not handling release
- }
-
- public void mouseDoubleClicked(MouseEvent me) {
- // do nothing: not handling release
- }
- });
- }
-
- 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.IDENTITY);
- 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 figure
- * the figure 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 org.eclipse.draw2d.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);
- 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 9e8ce1356..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java
+++ /dev/null
@@ -1,184 +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.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.widgets.Composite;
-
-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 org.eclipse.draw2d.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 comp
- * the composit whose rect should be used for the inset bounds
- * @param gc
- * the graphics object
- * @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);
- // TODO: deprecated with no obvious replacement:
- 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 = ColorConstants.red;
- 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() {
- // TODO: NOTE: this is overriding default border creation
- }
-
- 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 a30063e40..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 57e606252..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java
+++ /dev/null
@@ -1,570 +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.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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.jst.jsf.facesconfig.ui.EditorPlugin;
-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) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(), 0, "Error setting visible", 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) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText(java.lang.String)
- */
- public void setToolTipText(String text) {
- // do nothing
- }
-
- 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) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(int position) {
- // do nothing
- }
-
- /*
- * (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 45d15b4c3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java
+++ /dev/null
@@ -1,138 +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;
-
- /*
- * (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 8d4748938..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java
+++ /dev/null
@@ -1,288 +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 parent
- * @param managedForm
- * @param page
- * @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) {
- // do nothing; subs should override
- }
-
- /**
- * 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) {
- // do nothing; subs should override
- }
-
- /**
- * @return the page that this section lies in.
- */
- 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) {
- // do nothing: no selection change
- }
-
- /*
- * (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);
- }
-
- public void clearAll()
- {
- // do nothing, sub-classes may choose to override to clear their contents
- }
-}
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 34b51e9f0..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java
+++ /dev/null
@@ -1,136 +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.common.ui.internal.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 {
-
- /**
- * the common table viewer used for the contents
- */
- 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);
- }
-
- /**
- *
- * @param container
- * @return the table
- */
- abstract protected Table createTable(Composite container);
-
- /**
- *
- * @param tableViewer1
- */
- abstract protected void configTableViewer(TableViewer tableViewer1);
-
- /*
- * (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 b121d0ec8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java
+++ /dev/null
@@ -1,216 +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.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 the child class object
- */
- 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 = 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 tableViewer1) {
- tableViewer1.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 6a8d0fbbf..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
+++ /dev/null
@@ -1,505 +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 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 9c0f27eb6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
+++ /dev/null
@@ -1,403 +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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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("");
- }
- }
- }
-
- /**
- * 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 551b85f95..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
+++ /dev/null
@@ -1,88 +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
- */
- 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 baf609737..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.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.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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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("");
- }
-
- }
- }
-
- /**
- * 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 054fff77c..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.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.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
- */
- 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 baa845c72..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
+++ /dev/null
@@ -1,320 +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 abstract class FacesConfigMasterSection extends AbstractFacesConfigSection {
-
- private StructuredViewer structuredViewer;
-
- private 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 the structured viewer
- */
- 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 viewer
- */
- protected void configViewer(StructuredViewer viewer) {
- // do nothing; subs may override
- }
-
- /**
- * 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);
- }
- });
-
- setRemoveButton(toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, SWT.PUSH));
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- getRemoveButton().setLayoutData(gd);
- getRemoveButton().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
- });
- }
-
- /**
- *
- * @param e
- */
- protected abstract 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();
-
- getRemoveButton().setEnabled(!ssel.isEmpty());
- }
-
- /**
- *
- */
- public ISelection getSelection() {
- return structuredViewer.getSelection();
- }
-
- /**
- *
- */
- public void setSelection(ISelection selection) {
- structuredViewer.setSelection(selection);
- }
-
- /**
- * 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 the viewer
- */
- 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) {
- super.selectionChanged(event);
- updateButtons();
- }
-
- private void setRemoveButton(Button removeButton) {
- this.removeButton = removeButton;
- }
-
- /**
- * @return the remove button
- */
- protected Button getRemoveButton() {
- return removeButton;
- }
-}
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 7bcb10a35..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
+++ /dev/null
@@ -1,451 +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();
- }
- });
- }
-
- /**
- * 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 2ffe62a07..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java
+++ /dev/null
@@ -1,169 +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.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);
- }
-
- /**
- * @return an new object which is instance of <code>factoryChildClass</code>.
- */
- 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 = 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 tableViewer1) {
- tableViewer1.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 5c5b7c544..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java
+++ /dev/null
@@ -1,33 +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);
-
- /**
- * @return the input of this section
- */
- 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 4fb65dcd2..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java
+++ /dev/null
@@ -1,58 +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);
-
- /**
- * @return the input of this section
- */
- 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 db1dcb425..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
+++ /dev/null
@@ -1,363 +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.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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 parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- 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 beanTypeField1 = (RadiosDialogField) field;
-
- boolean bChangedSuccess = false;
- if (beanTypeField1.getSelectedIndex() == 0) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.MANAGED_PROPERTY,
- false);
- } else if (beanTypeField1.getSelectedIndex() == 1) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.MAP_ENTRIES, false);
- } else if (beanTypeField1.getSelectedIndex() == 2) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.LIST_ENTRIES, false);
- }
-
- if (bChangedSuccess) {
- currentPageIndex = beanTypeField1.getSelectedIndex();
- } else {
- beanTypeField1.setSelectedIndexWithoutUpdate(-1);
- beanTypeField1
- .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);
- }
- }
- }
-}
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 2c694c7d1..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
+++ /dev/null
@@ -1,156 +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.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 = 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 tableViewer1) {
- tableViewer1.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 1f623822a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
+++ /dev/null
@@ -1,630 +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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-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 section
- */
- public ListEntriesEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- // TODO: initialize?
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- // TODO: initialize?
- }
-
- /*
- * (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;
- }
-
- /*
- * (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() {
- return null;
- }
-
- /*
- * (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) {
- // do nothing
- }
-
- /*
- * (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()));
- }
- }
-
-}
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 518364884..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 tableViewer1 = CheckboxTableViewer.newCheckList(
- parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- tableViewer1.addCheckStateListener(this);
- tableViewer1.setSorter(new ViewerSorter());
- return tableViewer1;
- }
-
- /**
- * Add a filter for this table viewer, only <supported-locale> and
- * <default-locale> elements would be listed.
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.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 the supported locale object
- */
- 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 e7c475b14..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.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.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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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 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 1204dd19d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
+++ /dev/null
@@ -1,354 +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.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-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.PlatformUI;
-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;
- }
- }
- getRemoveButton().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) {
- final EObject mbean = (EObject) msg.getNewValue();
- if (EcoreUtil.getExistingAdapter(mbean,
- ManagedBeanMasterSection.class) == null) {
-
- mbean.eAdapters().add(
- getManagedBeanMasterSectionAdapter());
- }
-
- Runnable run = new Runnable() {
-
- public void run() {
- getStructuredViewer().refresh(true);
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- }
-
- };
- PlatformUI.getWorkbench().getDisplay().asyncExec(run);
- } else if (msg.getEventType() == Notification.REMOVE) {
-
- Runnable run = new Runnable() {
- public void run() {
- getStructuredViewer().refresh(true);
- }
-
- };
- PlatformUI.getWorkbench().getDisplay().asyncExec(run);
- }
-
- else if (msg.getEventType() == Notification.SET) {
- final Object mbean = msg.getNewValue();
- Runnable run = new Runnable() {
- public void run() {
- getStructuredViewer().refresh(mbean, true);
- }
-
- };
- PlatformUI.getWorkbench().getDisplay().asyncExec(run);
- }
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName()) {
-
- final Object bean = msg.getNotifier();
-
- Runnable run = new Runnable() {
-
- public void run() {
- getStructuredViewer().refresh(bean, true);
- }
-
- };
- PlatformUI.getWorkbench().getDisplay().asyncExec(run);
-
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope()) {
-
- final Object mbean = msg.getNotifier();
-
- Runnable run1 = new Runnable() {
-
- public void run() {
- getStructuredViewer().refresh();
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- }
-
- };
- PlatformUI.getWorkbench().getDisplay().asyncExec(run1);
- }
-
- }
- }
-
-}
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 18c9fc578..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.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-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 a2f16a086..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
+++ /dev/null
@@ -1,695 +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.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.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.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-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() {
- // TODO: 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 managedBean1 = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- KeyClassType keyClass = FacesConfigFactory.eINSTANCE
- .createKeyClassType();
- keyClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean1.getMapEntries() == null) {
- isNew = true;
- MapEntriesType mapEntries = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntries.setKeyClass(keyClass);
- cmd = SetCommand.create(editingDomain, managedBean1,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntries);
- } else {
- isNew = false;
- cmd = SetCommand.create(editingDomain, managedBean1
- .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 managedBean1 = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean1.getMapEntries() == null) {
- isNew = true;
- MapEntriesType mapEntries = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntries.setValueClass(valueClass);
- cmd = SetCommand.create(editingDomain, managedBean1,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntries);
- } else {
- isNew = false;
- cmd = SetCommand.create(editingDomain, managedBean1
- .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() {
- if (tableViewer.getSelection() == null
- || ((IStructuredSelection) tableViewer.getSelection())
- .isEmpty()) {
- return;
- }
- 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) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return null;
- }
-
- /*
- * (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) {
- // do nothing
- }
-
- /*
- * (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()));
- }
- }
-}
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 1d1d31243..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
+++ /dev/null
@@ -1,315 +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 {
-
- /**
- * Table viewer for all sections based on this calss
- */
- protected TableViewer tableViewer;
-
- private Button removeButton;
-
- /**
- *
- * @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 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);
- }
-