| author | Rainer Pielmann | 2012-09-04 03:21:51 (EDT) |
|---|---|---|
| committer | Stephan Born | 2012-09-10 08:46:47 (EDT) |
| commit | 95b6a23c277491d30fcd0ac2ba3df9b7613fa60e (patch) (side-by-side diff) | |
| tree | 7c8b8f04a968101d888fdaa9549c4bc4113fab75 | |
| parent | 5f59e748c84227e1c8b38c010d94ab62d1361c17 (diff) | |
| download | org.eclipse.stardust.ide-95b6a23c277491d30fcd0ac2ba3df9b7613fa60e.zip org.eclipse.stardust.ide-95b6a23c277491d30fcd0ac2ba3df9b7613fa60e.tar.gz org.eclipse.stardust.ide-95b6a23c277491d30fcd0ac2ba3df9b7613fa60e.tar.bz2 | |
Jira-ID: CRNT-25929
Remove "Infinity Analyst Perspective" from eclipse modeler functionality.
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@58888 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
24 files changed, 400 insertions, 804 deletions
diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/plugin.properties b/modeling/org.eclipse.stardust.modeling.common.ui/plugin.properties index e9ab6cb..e188152 100644 --- a/modeling/org.eclipse.stardust.modeling.common.ui/plugin.properties +++ b/modeling/org.eclipse.stardust.modeling.common.ui/plugin.properties @@ -18,6 +18,5 @@ carnotDrawingPreferencePageName = Drawing Preferences carnotCollisionPreferencePageName = Concurrency Management Preferences modelingPerspective = Infinity Development Perspective debugPerspective = Infinity Test Perspective -businessPerspectiveName = Infinity Analyst Perspective deploymentPreferencePageName = Deployment carnotMultiPackageModelingPreferencePageName = Multi Package Modeling Preferences
\ No newline at end of file diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/plugin.xml b/modeling/org.eclipse.stardust.modeling.common.ui/plugin.xml index 5943864..768e7ad 100644 --- a/modeling/org.eclipse.stardust.modeling.common.ui/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.common.ui/plugin.xml @@ -35,10 +35,6 @@ class="org.eclipse.stardust.modeling.common.ui.perspectives.DebuggingPerspective" icon="icons/full/obj16/model_debug.gif" name="%debugPerspective"/> - <perspective id="ag.carnot.workflow.modeler.businessModelingPerspective" - class="org.eclipse.stardust.modeling.common.ui.perspectives.BusinessModelingPerspective" - icon="icons/full/obj16/model.gif" - name="%businessPerspectiveName"/> </extension> <extension point="org.eclipse.jdt.ui.classpathContainerPage"> <classpathContainerPage id="org.eclipse.stardust.modeling.common.projectnature.carnotHomeLocation" diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/BpmUiConstants.java b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/BpmUiConstants.java index 05dee07..3f126db 100644 --- a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/BpmUiConstants.java +++ b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/BpmUiConstants.java @@ -16,8 +16,6 @@ public interface BpmUiConstants "ag.carnot.workflow.modeler.debuggingPerspective"; //$NON-NLS-1$ public static final String CWM_PERSPECTIVE_ID = "ag.carnot.workflow.modeler.workflowModelingPerspective"; //$NON-NLS-1$ - public static final String CWB_PERSPECTIVE_ID = - "ag.carnot.workflow.modeler.businessModelingPerspective"; //$NON-NLS-1$ public static final String ID_NEW_MODEL_WIZARD = "org.eclipse.stardust.modeling.core.wizards.NewWorkflowDiagramWizard"; //$NON-NLS-1$ public static final String ID_REPOSITORY_VIEW = diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/BusinessModelingPerspective.java b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/BusinessModelingPerspective.java deleted file mode 100644 index e83e5a7..0000000 --- a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/BusinessModelingPerspective.java +++ b/dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 SunGard CSA LLC and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * SunGard CSA LLC - initial API and implementation and/or initial documentation - *******************************************************************************/ -package org.eclipse.stardust.modeling.common.ui.perspectives; - -import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.stardust.modeling.common.ui.BpmUiConstants; -import org.eclipse.ui.IFolderLayout; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; -import org.eclipse.ui.cheatsheets.OpenCheatSheetAction; - - -public class BusinessModelingPerspective implements IPerspectiveFactory, BpmUiConstants -{ - public void createInitialLayout(IPageLayout layout) - { - layout.setEditorAreaVisible(true); - layout.setFixed(false); - - IFolderLayout fldNav = layout.createFolder("navigation", IPageLayout.LEFT, //$NON-NLS-1$ - IPageLayout.DEFAULT_FASTVIEW_RATIO, IPageLayout.ID_EDITOR_AREA); - fldNav.addView(IPageLayout.ID_OUTLINE); - - IFolderLayout fldDetails = layout.createFolder("details", IPageLayout.BOTTOM, //$NON-NLS-1$ - 1.0f - IPageLayout.DEFAULT_FASTVIEW_RATIO, IPageLayout.ID_EDITOR_AREA); - fldDetails.addView(BpmUiConstants.ID_REPOSITORY_VIEW); - fldDetails.addView(IPageLayout.ID_PROBLEM_VIEW); - - layout.addPerspectiveShortcut(CWM_PERSPECTIVE_ID); - layout.addPerspectiveShortcut(CWD_PERSPECTIVE_ID); - - layout.addNewWizardShortcut(BpmUiConstants.ID_NEW_MODEL_WIZARD); - - layout.addShowViewShortcut(BpmUiConstants.ID_REPOSITORY_VIEW); - layout.addShowViewShortcut(BpmUiConstants.ID_BOOKMARK_VIEW); - - layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET); - - /* open cheatsheets for analyst perspective */ - layout.addShowViewShortcut("org.eclipse.ui.cheatsheets.views.CheatSheetView"); //$NON-NLS-1$ - /* catch Exception while not working when opening a new workspace */ - - // #5319 temporarely removed cheat sheets since they contain the old style (JFC) - try - { - new OpenCheatSheetAction("org.eclipse.stardust.modeling.core.cheatsheetAnalystComp").run(); //$NON-NLS-1$ - } - catch (RuntimeException e) - { - } - } -} diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/DebuggingPerspective.java b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/DebuggingPerspective.java index 12e9aaa..9abe120 100644 --- a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/DebuggingPerspective.java +++ b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/DebuggingPerspective.java @@ -11,14 +11,13 @@ package org.eclipse.stardust.modeling.common.ui.perspectives; import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.stardust.engine.api.model.Modules; -import org.eclipse.stardust.modeling.common.ui.BpmUiActivator; -import org.eclipse.stardust.modeling.common.ui.BpmUiConstants; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; import org.eclipse.ui.console.IConsoleConstants; +import org.eclipse.stardust.modeling.common.ui.BpmUiConstants; + public class DebuggingPerspective implements IPerspectiveFactory, BpmUiConstants { public void createInitialLayout(IPageLayout layout) @@ -31,7 +30,7 @@ public class DebuggingPerspective implements IPerspectiveFactory, BpmUiConstants fldDetails.addView(IPageLayout.ID_PROBLEM_VIEW); fldDetails.addView(IConsoleConstants.ID_CONSOLE_VIEW); fldDetails.addView(IPageLayout.ID_PROP_SHEET); - + IFolderLayout fldDbg = layout.createFolder("control", IPageLayout.TOP, 0.25f, //$NON-NLS-1$ IPageLayout.ID_EDITOR_AREA); fldDbg.addView(IDebugUIConstants.ID_DEBUG_VIEW); @@ -48,10 +47,6 @@ public class DebuggingPerspective implements IPerspectiveFactory, BpmUiConstants IPageLayout.ID_EDITOR_AREA); fldNav.addView(IPageLayout.ID_OUTLINE); - if (BpmUiActivator.getDefault().initializeExtensions(Modules.ANALYSTS) == null) - { - layout.addPerspectiveShortcut(CWB_PERSPECTIVE_ID); - } layout.addPerspectiveShortcut(CWM_PERSPECTIVE_ID); layout.addShowViewShortcut(BpmUiConstants.ID_REPOSITORY_VIEW); diff --git a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/ModelingPerspective.java b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/ModelingPerspective.java index a4a0d52..415ee3e 100644 --- a/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/ModelingPerspective.java +++ b/modeling/org.eclipse.stardust.modeling.common.ui/src/org/eclipse/stardust/modeling/common/ui/perspectives/ModelingPerspective.java @@ -11,14 +11,13 @@ package org.eclipse.stardust.modeling.common.ui.perspectives; import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.stardust.engine.api.model.Modules; -import org.eclipse.stardust.modeling.common.ui.BpmUiActivator; -import org.eclipse.stardust.modeling.common.ui.BpmUiConstants; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; import org.eclipse.ui.cheatsheets.OpenCheatSheetAction; +import org.eclipse.stardust.modeling.common.ui.BpmUiConstants; + public class ModelingPerspective implements IPerspectiveFactory, BpmUiConstants { @@ -37,19 +36,15 @@ public class ModelingPerspective implements IPerspectiveFactory, BpmUiConstants fldDetails.addView(IPageLayout.ID_PROP_SHEET); fldDetails.addView(IPageLayout.ID_PROBLEM_VIEW); - if (BpmUiActivator.getDefault().initializeExtensions(Modules.ANALYSTS) == null) - { - layout.addPerspectiveShortcut(CWB_PERSPECTIVE_ID); - } layout.addPerspectiveShortcut(CWD_PERSPECTIVE_ID); layout.addNewWizardShortcut(BpmUiConstants.ID_NEW_MODEL_WIZARD); - + layout.addShowViewShortcut(BpmUiConstants.ID_REPOSITORY_VIEW); layout.addShowViewShortcut(BpmUiConstants.ID_BOOKMARK_VIEW); layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET); - + /* open cheatsheets for developer perspective */ layout.addShowViewShortcut("org.eclipse.ui.cheatsheets.views.CheatSheetView"); //$NON-NLS-1$ /* catch Exception while not working when opening a new workspace */ diff --git a/modeling/org.eclipse.stardust.modeling.core/plugin.xml b/modeling/org.eclipse.stardust.modeling.core/plugin.xml index 596b644..8154e82 100644 --- a/modeling/org.eclipse.stardust.modeling.core/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.core/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -102,7 +102,7 @@ icon="icons/full/obj16/history_view.gif" id="org.eclipse.stardust.modeling.core.modelserver.ui.VcsFeedView" name="%vcsFeedView"/> - + </extension> <extension point="org.eclipse.stardust.modeling.core.dataTypes"> @@ -217,7 +217,7 @@ <reference attributeName="carnot:engine:dataType" scope="struct"> - </reference> + </reference> </dataType> </extension> <extension @@ -662,7 +662,7 @@ icon="icons/full/obj16/activity.gif" id="_cwm_display_" name="%propPageActivityDisplay" - objectClass="org.eclipse.stardust.model.xpdl.carnot.ActivityType"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.ActivityType"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.ActivityControlFlowPropertyPage" @@ -678,9 +678,6 @@ id="_cwm_eventhandling_" name="%propPageActivityEventhandling" objectClass="org.eclipse.stardust.model.xpdl.carnot.ActivityType"> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -703,9 +700,6 @@ id="_cwm_controlling_" name="%propPageActivityControlling" objectClass="org.eclipse.stardust.model.xpdl.carnot.ActivityType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -713,7 +707,7 @@ icon="icons/full/obj16/process.gif" id="_cwm_general_" name="%propPageProcessGeneral" - objectClass="org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.ProcessDefinitionDataPathsPropertyPage" @@ -721,12 +715,9 @@ id="_cwm_data_paths_" name="%propPageProcessDatapaths" objectClass="org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType"> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> - - + + <page category="core" class="org.eclipse.stardust.modeling.core.properties.EventHandlingPropertyPage" @@ -734,9 +725,6 @@ id="_cwm_eventhandling_" name="%propPageProcessEventhandling" objectClass="org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType"> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -745,9 +733,6 @@ id="_cwm_controlling_" name="%propPageProcessControlling" objectClass="org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -763,9 +748,6 @@ id="_cwm_controlling_" name="%propPageApplicationControlling" objectClass="org.eclipse.stardust.model.xpdl.carnot.ApplicationType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -801,7 +783,7 @@ icon="icons/full/obj16/datapath.gif" id="_cwm_general_" name="%propPageDatapathGeneral" - objectClass="org.eclipse.stardust.model.xpdl.carnot.DataPathType"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.DataPathType"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.DiagramPropertyPage" @@ -841,30 +823,30 @@ category="core" class="org.eclipse.stardust.modeling.core.properties.QualityAssuranceCodesPropertyPage" icon="icons/full/obj16/model.gif" - id="_cwm_quality_control_codes_" + id="_cwm_quality_control_codes_" name="%propPageModelQualityControl" - objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.QualityAssuranceCodePropertyPage" icon="icons/full/obj16/model.gif" id="_cwm_quality_control_code_" name="%propPageModelQualityControlCode" - objectClass="org.eclipse.stardust.model.xpdl.carnot.Code"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.Code"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.VariablesConfigurationPage" icon="icons/full/obj16/model.gif" id="_cwm_model_variables_" name="%propPageModelVariables" - objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.ActivityCriticalityPropertyPage" icon="icons/full/obj16/model.gif" id="_cwm_model_variables_" name="%propPageActivityCriticality" - objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> + objectClass="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> <page category="core" class="org.eclipse.stardust.modeling.core.properties.OrganizationPropertyPage" @@ -886,9 +868,6 @@ id="_cwm_controlling_" name="%propPageOrganizationControlling" objectClass="org.eclipse.stardust.model.xpdl.carnot.OrganizationType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -904,9 +883,6 @@ id="_cwm_controlling_" name="%propPageRoleControlling" objectClass="org.eclipse.stardust.model.xpdl.carnot.RoleType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="core" @@ -946,9 +922,6 @@ <filter name="metaType" value="primitive"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -960,9 +933,6 @@ <filter name="metaType" value="serializable"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -974,9 +944,6 @@ <filter name="metaType" value="entity"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -988,9 +955,6 @@ <filter name="metaType" value="entity20"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1002,9 +966,6 @@ <filter name="metaType" value="plainXML"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1016,9 +977,6 @@ <filter name="metaType" value="sessionBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1030,9 +988,6 @@ <filter name="metaType" value="sessionBean20"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1044,9 +999,6 @@ <filter name="metaType" value="plainJava"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1058,9 +1010,6 @@ <filter name="metaType" value="jms"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1072,9 +1021,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.ApplicationType"/> <test property="com.infinity.properties.metaType" value="webservice"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> @@ -1088,9 +1034,6 @@ <filter name="feature:interactive" value="true"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -1104,17 +1047,6 @@ value="true"/> </page> <page - category="spi" - class="org.eclipse.stardust.modeling.core.properties.DataTypeHintPage" - icon="icons/full/obj16/primitive_data.gif" - id="_cwm_hint_data_" - name="%dataTypeHintPageName" - objectClass="org.eclipse.stardust.model.xpdl.carnot.DataType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </page> - <page category="core" class="org.eclipse.stardust.modeling.core.properties.ConditionalPerformerRuntimeBindingPropertyPage" icon="icons/full/obj16/conditional.gif" @@ -1228,9 +1160,9 @@ </page> </extension> - <extension + <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent"> - <category + <category id="carnot" name="%cheatSheetCategory"/> <cheatsheet @@ -1240,13 +1172,13 @@ id="org.eclipse.stardust.modeling.core.cheatsheetDevComp" name= "%mainCheatSheetName" > <description> - This tutorial will show you how to use the Process Workbench to create + This tutorial will show you how to use the Process Workbench to create a simple workflow model in the Eclipse modeler. </description> </cheatsheet> - + </extension> - + <extension point="org.eclipse.core.expressions.propertyTesters"> <propertyTester @@ -1269,7 +1201,7 @@ <viewPage class="org.eclipse.stardust.modeling.core.search.ReferencesResultPage" id="org.eclipse.stardust.modeling.core.referencesResultPage" - searchResultClass="org.eclipse.stardust.modeling.core.search.ReferencesSearchResult"/> + searchResultClass="org.eclipse.stardust.modeling.core.search.ReferencesSearchResult"/> </extension> <extension point="org.eclipse.ui.actionSets"> <actionSet @@ -1284,8 +1216,8 @@ style="push" toolbarPath="Normal/additions" tooltip="%deployModel"/> - </actionSet> - </extension> + </actionSet> + </extension> <extension id="ClassGenerator" point="org.eclipse.stardust.modeling.core.jaxwsClassGenerator"> diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/DiagramPlugin.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/DiagramPlugin.java index b24726f..6faec0d 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/DiagramPlugin.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/DiagramPlugin.java @@ -21,6 +21,13 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchManager; import org.eclipse.debug.core.model.IDebugTarget; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IPerspectiveDescriptor; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + import org.eclipse.stardust.common.StringUtils; import org.eclipse.stardust.model.xpdl.carnot.DiagramType; import org.eclipse.stardust.model.xpdl.carnot.IGraphicalObject; @@ -34,12 +41,6 @@ import org.eclipse.stardust.modeling.common.ui.ICWMDebugTarget; import org.eclipse.stardust.modeling.common.ui.jface.IImageManager; import org.eclipse.stardust.modeling.common.ui.jface.ImageManager; import org.eclipse.stardust.modeling.core.editors.WorkflowModelEditor; -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.IPerspectiveDescriptor; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. @@ -52,7 +53,7 @@ public class DiagramPlugin extends AbstractUIPlugin private IImageManager imageManager; private Map externalImageManagers = new HashMap(); - + public static final String CARNOT_WORKFLOW_MODEL_EDITOR_ID = "org.eclipse.stardust.modeling.core.editors.WorkflowModelEditor"; //$NON-NLS-1$ public static final String CONTEXT_MENU_ACTION_EXTENSION_POINT = "org.eclipse.stardust.modeling.core.contextMenuAction"; //$NON-NLS-1$ @@ -104,21 +105,21 @@ public class DiagramPlugin extends AbstractUIPlugin { return plugin; } - + public IImageManager getImageManager() { if (null == imageManager) { imageManager = new SpiAwareImageManager(); } - + return imageManager; } - + public IImageManager getImageManager(String bundleId) { IImageManager result = null; - + if (getBundle().getSymbolicName().equals(bundleId)) { result = getImageManager(); @@ -132,10 +133,10 @@ public class DiagramPlugin extends AbstractUIPlugin externalImageManagers.put(bundleId, result); } } - + return result; } - + public void setImageManager(IImageManager imageManager) { this.imageManager = imageManager; @@ -175,7 +176,7 @@ public class DiagramPlugin extends AbstractUIPlugin Iterator qualifiedPath = StringUtils.split(path, "}"); //$NON-NLS-1$ String bundleId = null; String imagePath = null; - + if (qualifiedPath.hasNext()) { bundleId = ((String) qualifiedPath.next()).substring(1); @@ -189,7 +190,7 @@ public class DiagramPlugin extends AbstractUIPlugin image = getDefault().getImageManager(bundleId).getImage(imagePath); } } - + return (null != image) ? image : getDefault().getImageManager().getImage(path); } @@ -202,7 +203,7 @@ public class DiagramPlugin extends AbstractUIPlugin Iterator<String> qualifiedPath = StringUtils.split(path, "}"); //$NON-NLS-1$ String bundleId = null; String imagePath = null; - + if (qualifiedPath.hasNext()) { bundleId = qualifiedPath.next().substring(1); @@ -216,7 +217,7 @@ public class DiagramPlugin extends AbstractUIPlugin image = getDefault().getImageManager(bundleId).getIcon(imagePath, style); } } - + return image != null ? image : getDefault().getImageManager().getImage(path); } @@ -234,9 +235,9 @@ public class DiagramPlugin extends AbstractUIPlugin { OrientationType direction = diagram.getOrientation(); return direction == null || OrientationType.VERTICAL_LITERAL.equals(direction); - + } - + public static boolean isVerticalModelling(IGraphicalObject symbol) { DiagramType diagram = ModelUtils.findContainingDiagram(symbol); @@ -285,8 +286,8 @@ public class DiagramPlugin extends AbstractUIPlugin } } } - - // TODO: Consider to refactor the logic of this method to an explicit interface. + + // TODO: Consider to refactor the logic of this method to an explicit interface. // Quick fix: This prevents exceptions when diagrams are exported by project tate. try { @@ -294,22 +295,16 @@ public class DiagramPlugin extends AbstractUIPlugin "org.eclipse.stardust.modeling.core.analystView"); //$NON-NLS-1$ } catch (RuntimeException e) - { + { return false; } } public static String getViewAsPerspectiveId(WorkflowModelEditor editor) { - return DiagramPlugin.isBusinessView(editor) ? BpmUiConstants.CWB_PERSPECTIVE_ID - : DiagramPlugin.getCurrentPerspectiveId(); + return DiagramPlugin.getCurrentPerspectiveId(); } - public static boolean isBusinessPerspective() - { - return BpmUiConstants.CWB_PERSPECTIVE_ID.equals(getCurrentPerspectiveId()); - } - private class SpiAwareImageManager extends ImageManager { public SpiAwareImageManager() @@ -326,7 +321,7 @@ public class DiagramPlugin extends AbstractUIPlugin Iterator qualifiedPath = StringUtils.split(path, "}"); //$NON-NLS-1$ String bundleId = null; String imagePath = null; - + if (qualifiedPath.hasNext()) { bundleId = ((String) qualifiedPath.next()).substring(1); @@ -345,7 +340,7 @@ public class DiagramPlugin extends AbstractUIPlugin { result = super.getImageDescriptor(path); } - + return result; } diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/LicensePage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/LicensePage.java index ff75f48..51e170e 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/LicensePage.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/LicensePage.java @@ -17,13 +17,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.common.config.Parameters; -import org.eclipse.stardust.engine.api.model.Modules; -import org.eclipse.stardust.modeling.common.ui.BpmUiActivator; -import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; -import org.eclipse.stardust.modeling.core.DiagramPlugin; -import org.eclipse.stardust.modeling.core.Diagram_Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; @@ -53,6 +46,14 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.dialogs.PreferencesUtil; import org.eclipse.ui.part.EditorPart; +import org.eclipse.stardust.common.StringUtils; +import org.eclipse.stardust.common.config.Parameters; +import org.eclipse.stardust.engine.api.model.Modules; +import org.eclipse.stardust.modeling.common.ui.BpmUiActivator; +import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; +import org.eclipse.stardust.modeling.core.DiagramPlugin; +import org.eclipse.stardust.modeling.core.Diagram_Messages; + public class LicensePage extends EditorPart { private final WorkflowModelEditor cwmEditor; @@ -91,11 +92,11 @@ public class LicensePage extends EditorPart { partControl.removeControlListener(controlListener); this.controlListener = null; - + partControl.removePaintListener(paintListener); this.paintListener = null; } - + super.dispose(); } @@ -138,17 +139,17 @@ public class LicensePage extends EditorPart public final void createPartControl(Composite parent) { this.partControl = new Composite(parent, SWT.NONE); - + GridLayout pageLayout = new GridLayout(1, false); pageLayout.marginHeight = 0; pageLayout.marginWidth = 0; pageLayout.verticalSpacing = 0; pageLayout.horizontalSpacing = 0; partControl.setLayout(pageLayout); - + Composite topPanel = new Composite(partControl, SWT.NONE); topPanel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - + GridLayout layout = new GridLayout(3, false); layout.marginHeight = 10; layout.marginWidth = 10; @@ -161,7 +162,7 @@ public class LicensePage extends EditorPart SWT.COLOR_LIST_FOREGROUND)); // label on top - + Label label = FormBuilder.createLabel(topPanel, getTitle(), 3); label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.HEADER_FONT)); label.setBackground(topPanel.getBackground()); @@ -185,7 +186,7 @@ public class LicensePage extends EditorPart } } }); - FormBuilder.createButton(topPanel, Diagram_Messages.BTN_Browse, new SelectionListener() + FormBuilder.createButton(topPanel, Diagram_Messages.BTN_Browse, new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -206,8 +207,8 @@ public class LicensePage extends EditorPart public void widgetDefaultSelected(SelectionEvent e) {} }); - - + + Link openPreferencesLink = new Link(topPanel, SWT.NULL); openPreferencesLink.setLayoutData(FormBuilder.createDefaultLabelGridData(3)); openPreferencesLink.setText(Diagram_Messages.LicensePage_ReferToCarnotPreferencePage); @@ -221,7 +222,7 @@ public class LicensePage extends EditorPart dialog.open(); } }); - + // now the main editor page Composite logoPanel = new Composite(partControl, SWT.NONE); logoPanel.setLayout(new GridLayout()); @@ -260,9 +261,9 @@ public class LicensePage extends EditorPart int left = (pageSize.x - size.width) / 2; Color foreground = e.gc.getForeground(); - int width = size.width; + int width = size.width; int start = 5; - + if (product != null) { start = drawString(e.gc, MessageFormat.format( @@ -289,7 +290,7 @@ public class LicensePage extends EditorPart ColorConstants.darkBlue, ColorConstants.white, 1, width); } e.gc.setForeground(foreground); - + int top = Math.max((pageSize.y - size.height) / 2, start); e.gc.drawImage(image, left, top); } @@ -308,7 +309,7 @@ public class LicensePage extends EditorPart for (int i = 0; i < splits.size(); i++) { String text = (String) splits.get(i); -// disable shadow as per change from CARNOT to Infinity/SunGard brand. +// disable shadow as per change from CARNOT to Infinity/SunGard brand. // gc.setForeground(shadow); // gc.drawString(text, left + delta, start + delta, true); gc.setForeground(base); @@ -383,29 +384,21 @@ public class LicensePage extends EditorPart private void updateStrings() { - Modules moduleName = Modules.DEVELOPER; - if (DiagramPlugin.isBusinessPerspective()) - { - BpmUiActivator.getDefault().initializeExtensions(Modules.ANALYSTS); - moduleName = Modules.ANALYSTS; - moduleError = BpmUiActivator.getDefault().getModuleError(); - } - else + Modules moduleName = Modules.DEVELOPER; + + BpmUiActivator.getDefault().initializeExtensions(Modules.DEVELOPER); + moduleError = BpmUiActivator.getDefault().getModuleError(); + if (Parameters.instance().getString("License." + moduleName + ".product") == null) //$NON-NLS-1$ //$NON-NLS-2$ { - BpmUiActivator.getDefault().initializeExtensions(Modules.DEVELOPER); - moduleError = BpmUiActivator.getDefault().getModuleError(); - if (Parameters.instance().getString("License." + moduleName + ".product") == null) //$NON-NLS-1$ //$NON-NLS-2$ + // try old modeling license + BpmUiActivator.getDefault().initializeExtensions(Modules.MODELLING); + if (Parameters.instance().getString("License." + Modules.MODELLING + ".product") != null) //$NON-NLS-1$ //$NON-NLS-2$ { - // try old modeling license - BpmUiActivator.getDefault().initializeExtensions(Modules.MODELLING); - if (Parameters.instance().getString("License." + Modules.MODELLING + ".product") != null) //$NON-NLS-1$ //$NON-NLS-2$ - { - moduleName = Modules.MODELLING; - moduleError = BpmUiActivator.getDefault().getModuleError(); - } + moduleName = Modules.MODELLING; + moduleError = BpmUiActivator.getDefault().getModuleError(); } } - + product = BpmUiActivator.getDefault().getString("License." + moduleName + ".product"); //$NON-NLS-1$ //$NON-NLS-2$ release = BpmUiActivator.getDefault().getString("License." + moduleName + ".release"); //$NON-NLS-1$ //$NON-NLS-2$ licensee = BpmUiActivator.getDefault().getString("License." + moduleName + ".licensee", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/UpgradePage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/UpgradePage.java index f035f88..cbec2a1 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/UpgradePage.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/UpgradePage.java @@ -16,12 +16,6 @@ import java.util.ArrayList; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.stardust.common.config.Parameters;
-import org.eclipse.stardust.engine.api.model.Modules;
-import org.eclipse.stardust.modeling.common.ui.BpmUiActivator; -import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; -import org.eclipse.stardust.modeling.core.DiagramPlugin; -import org.eclipse.stardust.modeling.core.Diagram_Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; @@ -44,6 +38,13 @@ import org.eclipse.ui.IEditorSite; import org.eclipse.ui.PartInitException; import org.eclipse.ui.part.EditorPart; +import org.eclipse.stardust.common.config.Parameters;
+import org.eclipse.stardust.engine.api.model.Modules;
+import org.eclipse.stardust.modeling.common.ui.BpmUiActivator;
+import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder;
+import org.eclipse.stardust.modeling.core.DiagramPlugin;
+import org.eclipse.stardust.modeling.core.Diagram_Messages;
+
public class UpgradePage extends EditorPart { private final WorkflowModelEditor cwmEditor; @@ -82,11 +83,11 @@ public class UpgradePage extends EditorPart { partControl.removeControlListener(controlListener); this.controlListener = null; - +
partControl.removePaintListener(paintListener); this.paintListener = null; } - +
super.dispose(); } @@ -129,17 +130,17 @@ public class UpgradePage extends EditorPart public final void createPartControl(Composite parent) { this.partControl = new Composite(parent, SWT.NONE); - +
GridLayout pageLayout = new GridLayout(1, false); pageLayout.marginHeight = 0; pageLayout.marginWidth = 0; pageLayout.verticalSpacing = 0; pageLayout.horizontalSpacing = 0; partControl.setLayout(pageLayout); - +
Composite topPanel = new Composite(partControl, SWT.NONE); topPanel.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false)); - +
GridLayout layout = new GridLayout(3, false); layout.marginHeight = 10; layout.marginWidth = 10; @@ -152,7 +153,7 @@ public class UpgradePage extends EditorPart SWT.COLOR_LIST_FOREGROUND)); // label on top - +
Label label = FormBuilder.createLabel(topPanel, getTitle(), 3); label.setFont(JFaceResources.getFontRegistry().get(JFaceResources.HEADER_FONT)); label.setBackground(topPanel.getBackground()); @@ -161,7 +162,7 @@ public class UpgradePage extends EditorPart Label lblLicensePath = FormBuilder.createLabel(topPanel, Diagram_Messages.LBL_MD_MUST_BE_UPGRADE); lblLicensePath.setBackground(topPanel.getBackground()); lblLicensePath.setForeground(topPanel.getForeground()); - FormBuilder.createButton(topPanel, Diagram_Messages.BUT_UPRGADE_NOW, new SelectionListener() + FormBuilder.createButton(topPanel, Diagram_Messages.BUT_UPRGADE_NOW, new SelectionListener()
{ public void widgetSelected(SelectionEvent e) { @@ -171,8 +172,8 @@ public class UpgradePage extends EditorPart public void widgetDefaultSelected(SelectionEvent e) {} }); - - FormBuilder.createButton(topPanel, Diagram_Messages.BUT_CLOSE_EDITOR, new SelectionListener() +
+ FormBuilder.createButton(topPanel, Diagram_Messages.BUT_CLOSE_EDITOR, new SelectionListener()
{ public void widgetSelected(SelectionEvent e) { @@ -221,9 +222,9 @@ public class UpgradePage extends EditorPart int left = (pageSize.x - size.width) / 2; Color foreground = e.gc.getForeground(); - int width = size.width; + int width = size.width;
int start = 5; - +
if (product != null) { start = drawString(e.gc, MessageFormat.format( @@ -250,7 +251,7 @@ public class UpgradePage extends EditorPart ColorConstants.darkBlue, ColorConstants.white, 1, width); } e.gc.setForeground(foreground); - +
int top = Math.max((pageSize.y - size.height) / 2, start); e.gc.drawImage(image, left, top); } @@ -269,7 +270,7 @@ public class UpgradePage extends EditorPart for (int i = 0; i < splits.size(); i++) { String text = (String) splits.get(i); -// disable shadow as per change from CARNOT to Infinity/SunGard brand. +// disable shadow as per change from CARNOT to Infinity/SunGard brand.
// gc.setForeground(shadow); // gc.drawString(text, left + delta, start + delta, true); gc.setForeground(base); @@ -344,26 +345,20 @@ public class UpgradePage extends EditorPart private void updateStrings() { - Modules module = Modules.DEVELOPER;
- if (DiagramPlugin.isBusinessPerspective()) + Modules module = Modules.DEVELOPER;
+ if (Parameters.instance().getString("License." + module.getId() + ".product") == null) //$NON-NLS-1$ //$NON-NLS-2$
{ - module = Modules.ANALYSTS;
- } - else - { - if (Parameters.instance().getString("License." + module.getId() + ".product") == null) //$NON-NLS-1$ //$NON-NLS-2$
+ // try old modeling license
+ if (Parameters.instance().getString("License." + Modules.MODELLING + ".product") != null) //$NON-NLS-1$ //$NON-NLS-2$
{ - // try old modeling license - if (Parameters.instance().getString("License." + Modules.MODELLING + ".product") != null) //$NON-NLS-1$ //$NON-NLS-2$ - { - module = Modules.MODELLING;
- } + module = Modules.MODELLING;
} } +
moduleError = MessageFormat.format(Diagram_Messages.ERROR_UNSUPPORTED_MD_VERSION, new Object[]{cwmEditor.getWorkflowModel().getCarnotVersion()}); - +
String moduleName = module.getId();
-
+
product = BpmUiActivator.getDefault().getString("License." + moduleName + ".product"); //$NON-NLS-1$ //$NON-NLS-2$
release = BpmUiActivator.getDefault().getString("License." + moduleName + ".release"); //$NON-NLS-1$ //$NON-NLS-2$ licensee = BpmUiActivator.getDefault().getString("License." + moduleName + ".licensee", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java index 07da89a..eeaeaa6 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/WorkflowModelEditor.java @@ -13,10 +13,27 @@ package org.eclipse.stardust.modeling.core.editors; import java.io.FileNotFoundException; import java.io.IOException; import java.text.MessageFormat; -import java.util.*; - -import org.eclipse.core.resources.*; -import org.eclipse.core.runtime.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +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.IConfigurationElement; +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.core.runtime.SubProgressMonitor; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; @@ -35,14 +52,50 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.swt.SWTException; +import org.eclipse.swt.events.ShellAdapter; +import org.eclipse.swt.events.ShellEvent; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.IPropertyListener; +import org.eclipse.ui.IURIEditorInput; +import org.eclipse.ui.IWindowListener; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.dialogs.SaveAsDialog; +import org.eclipse.ui.ide.IGotoMarker; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.views.contentoutline.IContentOutlinePage; + import org.eclipse.stardust.common.CollectionUtils; import org.eclipse.stardust.common.CompareHelper; import org.eclipse.stardust.common.config.CurrentVersion; import org.eclipse.stardust.common.config.Version; import org.eclipse.stardust.engine.api.model.Modules; -import org.eclipse.stardust.model.xpdl.carnot.*; +import org.eclipse.stardust.model.xpdl.carnot.ActivityImplementationType; +import org.eclipse.stardust.model.xpdl.carnot.DiagramType; +import org.eclipse.stardust.model.xpdl.carnot.EndEventSymbol; +import org.eclipse.stardust.model.xpdl.carnot.IGraphicalObject; +import org.eclipse.stardust.model.xpdl.carnot.IIdentifiableModelElement; +import org.eclipse.stardust.model.xpdl.carnot.IModelElement; +import org.eclipse.stardust.model.xpdl.carnot.IModelElementNodeSymbol; +import org.eclipse.stardust.model.xpdl.carnot.INodeSymbol; +import org.eclipse.stardust.model.xpdl.carnot.ModelType; +import org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType; +import org.eclipse.stardust.model.xpdl.carnot.PublicInterfaceSymbol; +import org.eclipse.stardust.model.xpdl.carnot.StartEventSymbol; import org.eclipse.stardust.model.xpdl.carnot.spi.SpiExtensionRegistry; -import org.eclipse.stardust.model.xpdl.carnot.util.*; +import org.eclipse.stardust.model.xpdl.carnot.util.ActivityUtil; +import org.eclipse.stardust.model.xpdl.carnot.util.CarnotConstants; +import org.eclipse.stardust.model.xpdl.carnot.util.ModelUtils; +import org.eclipse.stardust.model.xpdl.carnot.util.VariableContextHelper; +import org.eclipse.stardust.model.xpdl.carnot.util.WorkflowModelManager; import org.eclipse.stardust.modeling.common.projectnature.BpmProjectNature; import org.eclipse.stardust.modeling.common.ui.BpmUiActivator; import org.eclipse.stardust.modeling.common.ui.IWorkflowModelEditor; @@ -54,7 +107,57 @@ import org.eclipse.stardust.modeling.core.decoration.IDecorationTarget; import org.eclipse.stardust.modeling.core.editors.parts.IconFactory; import org.eclipse.stardust.modeling.core.editors.parts.NotificationAdaptee; import org.eclipse.stardust.modeling.core.editors.parts.NotificationAdapter; -import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.*; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.AddExternalReferenceAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CloseDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CommitChangesAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ConnectAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CopyAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateActivityAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateActivityGraphAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateApplicationAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateConditionalPerformerAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateDataAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateInteractiveApplicationAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateLinkTypeAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateOrganizationAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateOrganizationHierarchyAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateProcessDefinitionAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateRepositoryConnectionAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateRoleAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateSubprocessAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.CreateTriggerAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.DeleteExternalReferenceAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.DeleteSymbolAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.DeployModelAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ElementSelectionAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ExportDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.FixInvalidIdsAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ForwardDeleteAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ImportConnectionObjectAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ImportModelElementsAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.LockAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.LockAllAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.OpenDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.OptimizeDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.PasteAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ReferencesSearchAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.RefreshConnectionObjectAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ReloadConnectionsAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ResetSubprocessAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.RevertChangesAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.SearchAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.SearchConnectionAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.SetDefaultParticipantAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ShareModelAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ShowPropertiesAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.UnLockAllAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.UnshareModelAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.UpdateDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.UpdateModelAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.UpgradeDataAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.UpgradeModelAndDiagramAction; +import org.eclipse.stardust.modeling.core.editors.parts.diagram.actions.ValidateModelAction; import org.eclipse.stardust.modeling.core.editors.parts.diagram.commands.DeleteSymbolCommandFactory; import org.eclipse.stardust.modeling.core.jobs.ModelValidationJob; import org.eclipse.stardust.modeling.core.modelserver.ModelServer; @@ -63,16 +166,6 @@ import org.eclipse.stardust.modeling.repository.common.ExtendedModelManager; import org.eclipse.stardust.modeling.repository.common.ObjectRepositoryActivator; import org.eclipse.stardust.modeling.validation.ValidationPlugin; import org.eclipse.stardust.modeling.validation.ValidationService; -import org.eclipse.swt.SWTException; -import org.eclipse.swt.events.ShellAdapter; -import org.eclipse.swt.events.ShellEvent; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.*; -import org.eclipse.ui.actions.ActionFactory; -import org.eclipse.ui.dialogs.SaveAsDialog; -import org.eclipse.ui.ide.IGotoMarker; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.views.contentoutline.IContentOutlinePage; public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor implements IWorkflowModelEditor, EditPartRegistry, IGotoMarker, IDecorationTarget @@ -86,7 +179,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor private Map<NotificationAdaptee, NotificationAdapter> adapters = CollectionUtils.newMap(); private Set<IDiagramChangeListener> diagramChangeListeners = CollectionUtils.newSet(); - + private ModelServer modelServer; private final ValidationIssueManager validationIssueManager = new ValidationIssueManager(); @@ -102,7 +195,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } private WorkflowModelOutlinePage outlinePage; - + private VariableContextHelper variableContextHelper = VariableContextHelper.getInstance(); public AbstractMultiPageGraphicalEditorOutlinePage getOutlinePage() @@ -120,7 +213,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor private IconFactory iconFactory; - protected Boolean upgradeChecked; + protected Boolean upgradeChecked; public WorkflowModelEditor() { @@ -138,7 +231,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor }); iconFactory = new IconFactory(this); } - + public WorkflowModelManager getModelManager() { return modelManager; @@ -157,13 +250,13 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } variableContextHelper.removeContext(this.getWorkflowModel()); super.dispose(); - } - + } + public boolean isChanged() { return changed; - } - + } + public IconFactory getIconFactory() { return iconFactory; @@ -172,8 +265,8 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor public ActionRegistry getActionRegistry() { return super.getActionRegistry(); - } - + } + public void addDiagramChangeListener(IDiagramChangeListener listener) { if (null != listener && !diagramChangeListeners.contains(listener)) @@ -214,15 +307,15 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor addEditPartAction(new UnshareModelAction(this)); addEditPartAction(new UpdateModelAction(this)); addEditPartAction(new CommitChangesAction(this)); - + addEditPartAction(new UnLockAllAction(this)); addEditPartAction(new LockAllAction(this)); addEditPartAction(new LockAction(this)); addEditPartAction(new RevertChangesAction(this)); - + addEditPartAction(new CopyAction(this)); addEditPartAction(new PasteAction(this)); - + addEditPartAction(new SetDefaultParticipantAction(this)); addEditPartAction(new ConnectAction(this)); @@ -241,7 +334,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor addEditPartAction(new SearchAction(this)); // search over Connection // addEditPartAction(new SearchConnectionAction(this)); - + ShowPropertiesAction propDlgAction = new ShowPropertiesAction(this, getSite() .getSelectionProvider()); propDlgAction.setId(ActionFactory.PROPERTIES.getId()); @@ -258,7 +351,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor addEditPartAction(deleteSymbolAction); addEditPartAction(new ForwardDeleteAction(this, getActionRegistry())); // deploy model - addEditPartAction(new DeployModelAction(this)); + addEditPartAction(new DeployModelAction(this)); addEditPartAction(new ImportModelElementsAction(this)); addEditPartAction(new CreateActivityAction(null, DiagramActionConstants.CREATE_GENERIC_ACTIVITY, this)); @@ -310,34 +403,34 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } addEditPartAction(new CreateDataAction(null, this)); - // REPOSITORY CONNECTION STUFF - // ask the plugin for all extensions + // REPOSITORY CONNECTION STUFF + // ask the plugin for all extensions Map<String, IConfigurationElement> connectionExtensions = registry .getExtensions(ObjectRepositoryActivator.PLUGIN_ID, - ObjectRepositoryActivator.CONNECTION_EXTENSION_POINT_ID); + ObjectRepositoryActivator.CONNECTION_EXTENSION_POINT_ID); for (IConfigurationElement config : connectionExtensions.values()) { addEditPartAction(new CreateRepositoryConnectionAction(config, this)); - } + } Map<String, IConfigurationElement> searchConnectionExtensions = registry .getExtensions(ObjectRepositoryActivator.PLUGIN_ID, - ObjectRepositoryActivator.CONNECTION_SEARCH_EXTENSION_POINT_ID); + ObjectRepositoryActivator.CONNECTION_SEARCH_EXTENSION_POINT_ID); for (IConfigurationElement config : searchConnectionExtensions.values()) { addEditPartAction(new SearchConnectionAction(config, this)); - } + } // search over Connection // addEditPartAction(new SearchConnectionAction(this)); - + addEditPartAction(new ElementSelectionAction(this)); - - // 2 new Actions (1 for linking an object from the tree in the outline) + + // 2 new Actions (1 for linking an object from the tree in the outline) // addEditPartAction(new LinkConnectionObjectAction(this)); addEditPartAction(new ImportConnectionObjectAction(this)); addEditPartAction(new RefreshConnectionObjectAction(this)); addEditPartAction(new AddExternalReferenceAction(this)); addEditPartAction(new DeleteExternalReferenceAction(this)); - + Map<String, IConfigurationElement> triggerExtensions = registry .getExtensions(CarnotConstants.TRIGGER_TYPES_EXTENSION_POINT_ID); for (IConfigurationElement config : triggerExtensions.values()) @@ -430,7 +523,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } /** - * + * * @return false if the model needed upgrade but the user had declined */ boolean checkUpgradeModel() @@ -455,9 +548,9 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } else if (modelVersion.compareTo(carnotVersion, true) > 0) { - message = MessageFormat.format(Diagram_Messages.MSG_DIA_MODEL_NULL_WAS_CREATED_USING_A_NEWER_VERSION_OF_THE_MODELER_ONE + message = MessageFormat.format(Diagram_Messages.MSG_DIA_MODEL_NULL_WAS_CREATED_USING_A_NEWER_VERSION_OF_THE_MODELER_ONE + "\n" + Diagram_Messages.MSG_DIA_CHANGING_MODEL_IS_NOT_RECOMMENDED, new Object[]{cwmModel.getName(), modelVersion.toString()}); //$NON-NLS-1$ - + MessageDialog dialog = new MessageDialog(getSite().getShell(), Diagram_Messages.LB_UpgradeModel, null, message, MessageDialog.INFORMATION, new String[] {IDialogConstants.OK_LABEL}, 0); @@ -526,7 +619,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor DecorationUtils.applyDecoration(decoration, page.getGraphicalViewer() .getRootEditPart().getChildren()); } - + fireDiagramPageOpened(page); return pageId; } @@ -895,11 +988,8 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor private void initializeExtensions() { - initialized = DiagramPlugin.isBusinessPerspective() - && BpmUiActivator.getDefault().initializeExtensions(Modules.ANALYSTS) == null - || !DiagramPlugin.isBusinessPerspective() - && (BpmUiActivator.getDefault().initializeExtensions(Modules.DEVELOPER) == null - || BpmUiActivator.getDefault().initializeExtensions(Modules.MODELLING) == null); + initialized = (BpmUiActivator.getDefault().initializeExtensions(Modules.DEVELOPER) == null || BpmUiActivator.getDefault() + .initializeExtensions(Modules.MODELLING) == null); } private void forceRefresh() @@ -964,7 +1054,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor // When dealing with no or an invalid license this can happen return; } - + VariableContextHelper.getInstance().storeVariables(getWorkflowModel(), true); if (!PlatformUI.getPreferenceStore().getBoolean( @@ -1051,7 +1141,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor // getConnectionManager(model).resolve(model); } modelServer = new ModelServer(model); - + variableContextHelper.storeVariables(model, false); return model; @@ -1132,7 +1222,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } private void save(IFile file, IProgressMonitor progressMonitor) throws CoreException - { + { getEditorInputTracker().removeChangeVisitor(editorChangeTracker); if (null == progressMonitor) @@ -1161,7 +1251,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor { t.printStackTrace(); } - + fixMissingOids(); modelManager.save(URI.createPlatformResourceURI(file.getFullPath().toString(), false)); @@ -1174,10 +1264,10 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor connectionManager.save(); } */ - - + + progressMonitor.worked(1); - + file.refreshLocal(IResource.DEPTH_ZERO, new SubProgressMonitor(progressMonitor, 1)); progressMonitor.done(); @@ -1370,7 +1460,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor { selectElement(element); ShowPropertiesAction showPropertiesAction = new ShowPropertiesAction(this, outlinePage.getSite().getSelectionProvider()); - showPropertiesAction.run(); + showPropertiesAction.run(); } } @@ -1387,13 +1477,13 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor for (int i = 0; i < getPageCount(); i++ ) { DiagramEditorPage page = (DiagramEditorPage) getEditor(i); - + DecorationUtils.applyDecoration(decoration, page.getGraphicalViewer() .getRootEditPart().getChildren()); } } } - + public void disableDecoration(IDecorationProvider decoration) { if (hasDecoration(decoration)) @@ -1401,7 +1491,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor for (int i = 0; i < getPageCount(); i++ ) { DiagramEditorPage page = (DiagramEditorPage) getEditor(i); - + DecorationUtils.removeDecoration(decoration, page.getGraphicalViewer() .getRootEditPart().getChildren()); } @@ -1432,7 +1522,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor e.printStackTrace(); } } - + List<EditPart> editParts = CollectionUtils.newList(); for(Object symbol : symbols) { @@ -1442,7 +1532,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor getEditorSite().getSelectionProvider().setSelection( new StructuredSelection(editParts)); } - + public void selectSymbol(INodeSymbol symbol) { DiagramType diagram = getDiagram(symbol); @@ -1521,7 +1611,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor super.setFocus(); } catch(SWTException e) - { + { } forceRefresh(); checkChanged(); @@ -1588,7 +1678,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor public class EditorChangeTracker implements IResourceDeltaVisitor { public boolean isEnabled = true; - + public void setEnabled(boolean isEnabled) { this.isEnabled = isEnabled; @@ -1600,7 +1690,7 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor { return false; } - + if (delta.getKind() == IResourceDelta.CHANGED) { if ((delta.getFlags() & (IResourceDelta.CONTENT | IResourceDelta.REPLACED | IResourceDelta.SYNC)) != 0) @@ -1614,8 +1704,8 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } else { - changed = true; - } + changed = true; + } } } return false; @@ -1668,8 +1758,8 @@ public class WorkflowModelEditor extends AbstractMultiPageGraphicalEditor } return false; } - - + + }
\ No newline at end of file diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/commands/ReloadConnectionCommandFactory.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/commands/ReloadConnectionCommandFactory.java index c650a5d..e965b68 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/commands/ReloadConnectionCommandFactory.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/editors/parts/diagram/commands/ReloadConnectionCommandFactory.java @@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.CompoundCommand; + import org.eclipse.stardust.common.CollectionUtils; import org.eclipse.stardust.engine.api.model.PredefinedConstants; import org.eclipse.stardust.model.xpdl.carnot.ActivitySymbolType; @@ -62,7 +63,6 @@ import org.eclipse.stardust.model.xpdl.carnot.util.AttributeUtil; import org.eclipse.stardust.model.xpdl.carnot.util.DiagramUtil; import org.eclipse.stardust.model.xpdl.carnot.util.ModelUtils; import org.eclipse.stardust.modeling.common.ui.IdFactory; -import org.eclipse.stardust.modeling.core.DiagramPlugin; import org.eclipse.stardust.modeling.core.Diagram_Messages; import org.eclipse.stardust.modeling.core.editors.figures.anchors.TransitionConnectionAnchor; import org.eclipse.stardust.modeling.core.ui.StringUtils; @@ -106,9 +106,8 @@ public class ReloadConnectionCommandFactory .getISymbolContainer_DataMappingConnection(), Diagram_Messages.CONN_NAME_DataMapping, PKG .getDataMappingConnectionType()); - - if ((ActivityUtil.isApplicationActivity(activity) || - DiagramPlugin.isBusinessPerspective()) + + if (ActivityUtil.isApplicationActivity(activity) && activity.getApplication() != null) { reloadConnections(command, activitySymbol, false, Collections @@ -119,8 +118,7 @@ public class ReloadConnectionCommandFactory Diagram_Messages.CONN_NAME_ExecutedBy, PKG .getExecutedByConnectionType()); } - if ((ActivityUtil.isInteractive(activity) || - DiagramPlugin.isBusinessPerspective()) + if (ActivityUtil.isInteractive(activity) && activity.getPerformer() != null) { reloadConnections(command, activitySymbol, false, Collections @@ -441,7 +439,7 @@ public class ReloadConnectionCommandFactory else { symbolContainer = diagram; - } + } } } @@ -518,8 +516,7 @@ public class ReloadConnectionCommandFactory Set<ActivityType> activitySet = CollectionUtils.newSet(); for (ActivityType activity : process.getActivity()) { - if ((ActivityUtil.isInteractive(activity) - || DiagramPlugin.isBusinessPerspective()) + if (ActivityUtil.isInteractive(activity) && participant.equals(activity.getPerformer())) { activitySet.add(activity); @@ -534,8 +531,7 @@ public class ReloadConnectionCommandFactory Set<ActivityType> activitySet = CollectionUtils.newSet(); for (ActivityType activity : process.getActivity()) { - if ((ActivityUtil.isApplicationActivity(activity) || - DiagramPlugin.isBusinessPerspective()) + if (ActivityUtil.isApplicationActivity(activity) && application.equals(activity.getApplication())) { activitySet.add(activity); diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/DataTypeHintPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/DataTypeHintPage.java deleted file mode 100644 index 1c0fa46..0000000 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/properties/DataTypeHintPage.java +++ b/dev/null @@ -1,142 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 SunGard CSA LLC and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * SunGard CSA LLC - initial API and implementation and/or initial documentation - *******************************************************************************/ -package org.eclipse.stardust.modeling.core.properties; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.stardust.model.xpdl.carnot.IExtensibleElement; -import org.eclipse.stardust.model.xpdl.carnot.IModelElement; -import org.eclipse.stardust.model.xpdl.carnot.IModelElementNodeSymbol; -import org.eclipse.stardust.model.xpdl.carnot.util.CarnotConstants; -import org.eclipse.stardust.modeling.common.ui.jface.databinding.IBindingMediator; -import org.eclipse.stardust.modeling.common.ui.jface.databinding.SwtWidgetAdapter; -import org.eclipse.stardust.modeling.common.ui.jface.utils.FormBuilder; -import org.eclipse.stardust.modeling.core.Diagram_Messages; -import org.eclipse.stardust.modeling.core.utils.WidgetBindingManager; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.ui.IWorkbenchPropertyPage; - - -public class DataTypeHintPage extends AbstractModelElementPropertyPage - implements IWorkbenchPropertyPage -{ - private Button textButton; - - private Button numericButton; - - private Button complexButton; - - private List buttons = new ArrayList(); - - public void loadFieldsFromElement(IModelElementNodeSymbol symbol, IModelElement element) - { - WidgetBindingManager binding = getWidgetBindingManager(); - - for (Iterator iter = buttons.iterator(); iter.hasNext();) - { - Button btn = (Button) iter.next(); - binding.getModelBindingManager() - .bind( - WidgetBindingManager.createModelAdapter( - (IExtensibleElement) element, - CarnotConstants.DATA_TYPE_HINT_ATT, false), - getSwtButtonAdapter(btn)); - } - - } - - private SwtWidgetAdapter getSwtButtonAdapter(Button button) - { - return new SwtWidgetAdapter(button) - { - private SelectionListener listener; - - public void bind(IBindingMediator manager) - { - super.bind(manager); - - final Button button = (Button) getWidget(); - - button.addSelectionListener(new SelectionAdapter() - { - public void widgetSelected(SelectionEvent e) - { - String value = null; - if (textButton.getSelection()) - { - value = CarnotConstants.TEXT_HINT; - } - else if (numericButton.getSelection()) - { - value = CarnotConstants.NUMERIC_HINT; - } - else if (complexButton.getSelection()) - { - value = CarnotConstants.COMPLEX_HINT; - } - updateModel(value); - } - }); - } - - public void unbind() - { - if (null != listener) - { - if (!getWidget().isDisposed()) - { - ((Button) getWidget()).removeSelectionListener(listener); - } - listener = null; - } - - super.unbind(); - } - - public void updateControl(Object value) - { - value = value != null ? value : CarnotConstants.TEXT_HINT; - textButton.setSelection(CarnotConstants.TEXT_HINT.equals(value)); - numericButton.setSelection(CarnotConstants.NUMERIC_HINT.equals(value)); - complexButton.setSelection(CarnotConstants.COMPLEX_HINT.equals(value)); - } - }; - } - - public void loadElementFromFields(IModelElementNodeSymbol symbol, IModelElement element) - {} - - public Control createBody(Composite parent) - { - Composite composite = FormBuilder.createComposite(parent, 1); - Group group = FormBuilder.createGroup(composite, - Diagram_Messages.DataTypeHintPage_GroupLabel, 1); - textButton = FormBuilder.createRadioButton(group, - Diagram_Messages.DataTypeHintPage_TextLabel); - numericButton = FormBuilder.createRadioButton(group, - Diagram_Messages.DataTypeHintPage_NumericLabel); - complexButton = FormBuilder.createRadioButton(group, - Diagram_Messages.DataTypeHintPage_ComplexLabel); - buttons.add(textButton); - buttons.add(numericButton); - buttons.add(complexButton); - return composite; - } - -} diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java index 3a9cc7d..f79179a 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizard.java @@ -97,7 +97,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard { private ISelection selection; private IPreferenceStore pStore; - + /** * Constructor for NewWorkflowDiagramWizard. */ @@ -148,14 +148,6 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard manager.save(fileURI); monitor.worked(1); openEditor(monitor, file); - // temporarily disabled because the cheetsheet is not in the distribution, - // either because it was not commited or it was not copied in the relevant place. -/* if ("ag.carnot.workflow.modeler.businessModelingPerspective".equals(DiagramPlugin //$NON-NLS-1$ - .getCurrentPerspectiveId())) - { - new OpenCheatSheetAction("org.eclipse.stardust.modeling.core.newModel") //$NON-NLS-1$ - .run(); - }*/ result[0] = true; } catch (CoreException e) @@ -194,7 +186,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard setModelAttributes(model, props.getModelId(), props.getModelName(), props .getModelDescription(), props.getModelAuthor()); pStore = PlatformUI.getPreferenceStore(); - + createDefaultDiagrams(model); createDefaultTypes(model); createDefaultData(model); @@ -204,7 +196,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard } private void createDefaultProcess(ModelType model) - { + { CarnotWorkflowModelFactory factory = CarnotWorkflowModelFactory.eINSTANCE; ProcessDefinitionType process = factory.createProcessDefinitionType(); IdFactory idFactory = new IdFactory( @@ -217,31 +209,31 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard DiagramType diagram = factory.createDiagramType(); diagram.setName(Diagram_Messages.DIAGRAM_NAME_Default); diagram.setElementOid(ModelUtils.getElementOid(diagram, model)); - + String modelingDirection; // in case the PreferenceStore is not initialized if(pStore.contains(BpmProjectNature.PREFERENCE_MODELING_DIRECTION)) { - modelingDirection = pStore.getString(BpmProjectNature.PREFERENCE_MODELING_DIRECTION); + modelingDirection = pStore.getString(BpmProjectNature.PREFERENCE_MODELING_DIRECTION); } else { - modelingDirection = BpmProjectNature.DEFAULT_PREFERENCE_MODELING_DIRECTION; - } + modelingDirection = BpmProjectNature.DEFAULT_PREFERENCE_MODELING_DIRECTION; + } diagram.setOrientation(OrientationType.VERTICAL_LITERAL.toString().equals(modelingDirection) ? OrientationType.VERTICAL_LITERAL - : OrientationType.HORIZONTAL_LITERAL); - + : OrientationType.HORIZONTAL_LITERAL); + DiagramModeType defaultMode; boolean classicMode; if(pStore.contains(BpmProjectNature.PREFERENCE_CLASSIC_MODE)) { - classicMode = pStore.getBoolean(BpmProjectNature.PREFERENCE_CLASSIC_MODE); + classicMode = pStore.getBoolean(BpmProjectNature.PREFERENCE_CLASSIC_MODE); } else { - classicMode = BpmProjectNature.DEFAULT_PREFERENCE_CLASSIC_MODE; - } + classicMode = BpmProjectNature.DEFAULT_PREFERENCE_CLASSIC_MODE; + } if (classicMode) { defaultMode = DiagramModeType.MODE_400_LITERAL; @@ -251,7 +243,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard defaultMode = DiagramModeType.MODE_450_LITERAL; } diagram.setMode(defaultMode); - + process.getDiagram().add(diagram); DiagramUtil.createDefaultPool(diagram); } @@ -299,91 +291,91 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard defaultDataTypes[2]); DataType lastActivityPerformer = createData(model, dataType2, - "LAST_ACTIVITY_PERFORMER", Diagram_Messages.NAME_LastActivityPerformer, //$NON-NLS-1$ + "LAST_ACTIVITY_PERFORMER", Diagram_Messages.NAME_LastActivityPerformer, //$NON-NLS-1$ Diagram_Messages.DESC_LastActivityPerformer); createAttribute(lastActivityPerformer, PredefinedConstants.BROWSABLE_ATT, - "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(lastActivityPerformer, PredefinedConstants.HOME_INTERFACE_ATT, null, - "org.eclipse.stardust.engine.api.runtime.UserHome"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.UserHome"); //$NON-NLS-1$ createAttribute(lastActivityPerformer, PredefinedConstants.IS_LOCAL_ATT, - "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(lastActivityPerformer, PredefinedConstants.JNDI_PATH_ATT, null, - "org.eclipse.stardust.engine.api.runtime.User"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.User"); //$NON-NLS-1$ createAttribute(lastActivityPerformer, PredefinedConstants.PRIMARY_KEY_ATT, null, - "org.eclipse.stardust.engine.api.runtime.UserPK"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.UserPK"); //$NON-NLS-1$ createAttribute(lastActivityPerformer, PredefinedConstants.REMOTE_INTERFACE_ATT, - null, "org.eclipse.stardust.engine.core.runtime.beans.IUser"); //$NON-NLS-1$ + null, "org.eclipse.stardust.engine.core.runtime.beans.IUser"); //$NON-NLS-1$ DataType startingUser = createData(model, dataType2, - "STARTING_USER", Diagram_Messages.NAME_StartingUser, //$NON-NLS-1$ + "STARTING_USER", Diagram_Messages.NAME_StartingUser, //$NON-NLS-1$ Diagram_Messages.DESC_StartingUser); - createAttribute(startingUser, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(startingUser, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(startingUser, PredefinedConstants.HOME_INTERFACE_ATT, null, - "org.eclipse.stardust.engine.api.runtime.UserHome"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.UserHome"); //$NON-NLS-1$ createAttribute(startingUser, PredefinedConstants.IS_LOCAL_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(startingUser, PredefinedConstants.JNDI_PATH_ATT, null, - "ag.carnot.workflow.runtime.User"); //$NON-NLS-1$ + "ag.carnot.workflow.runtime.User"); //$NON-NLS-1$ createAttribute(startingUser, PredefinedConstants.PRIMARY_KEY_ATT, null, - "org.eclipse.stardust.engine.api.runtime.UserPK"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.UserPK"); //$NON-NLS-1$ createAttribute(startingUser, PredefinedConstants.REMOTE_INTERFACE_ATT, null, - "org.eclipse.stardust.engine.core.runtime.beans.IUser"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.core.runtime.beans.IUser"); //$NON-NLS-1$ DataType currentUser = createData(model, dataType2, PredefinedConstants.CURRENT_USER, Diagram_Messages.NAME_CurrentUser, Diagram_Messages.DESC_CurrentUser); - createAttribute(currentUser, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(currentUser, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(currentUser, PredefinedConstants.HOME_INTERFACE_ATT, null, - "org.eclipse.stardust.engine.api.runtime.UserHome"); //$NON-NLS-1$ - createAttribute(currentUser, PredefinedConstants.IS_LOCAL_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + "org.eclipse.stardust.engine.api.runtime.UserHome"); //$NON-NLS-1$ + createAttribute(currentUser, PredefinedConstants.IS_LOCAL_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(currentUser, PredefinedConstants.JNDI_PATH_ATT, null, - "org.eclipse.stardust.engine.api.runtime.User"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.User"); //$NON-NLS-1$ createAttribute(currentUser, PredefinedConstants.PRIMARY_KEY_ATT, null, - "org.eclipse.stardust.engine.api.runtime.UserPK"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.UserPK"); //$NON-NLS-1$ createAttribute(currentUser, PredefinedConstants.REMOTE_INTERFACE_ATT, null, - "org.eclipse.stardust.engine.core.runtime.beans.IUser"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.core.runtime.beans.IUser"); //$NON-NLS-1$ DataType processId = createData(model, dataType0, PredefinedConstants.PROCESS_ID, Diagram_Messages.NAME_ProcessOID, Diagram_Messages.DESC_ProcessOID); - createAttribute(processId, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(processId, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(processId, PredefinedConstants.TYPE_ATT, - "ag.carnot.workflow.spi.providers.data.java.Type", "long"); //$NON-NLS-1$ //$NON-NLS-2$ + "ag.carnot.workflow.spi.providers.data.java.Type", "long"); //$NON-NLS-1$ //$NON-NLS-2$ DataType processPriority = createData(model, dataType0, PredefinedConstants.PROCESS_PRIORITY, Diagram_Messages.NAME_ProcessPriority, Diagram_Messages.DESC_ProcessPriority); - + createAttribute(processPriority, PredefinedConstants.TYPE_ATT, - "ag.carnot.workflow.spi.providers.data.java.Type", "int"); //$NON-NLS-1$ //$NON-NLS-2$ + "ag.carnot.workflow.spi.providers.data.java.Type", "int"); //$NON-NLS-1$ //$NON-NLS-2$ DataType rootProcessId = createData(model, dataType0, PredefinedConstants.ROOT_PROCESS_ID, Diagram_Messages.NAME_RootProcessOID, Diagram_Messages.DESC_RootProcessOID); - createAttribute(rootProcessId, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(rootProcessId, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(rootProcessId, PredefinedConstants.TYPE_ATT, - "ag.carnot.workflow.spi.providers.data.java.Type", "long"); //$NON-NLS-1$ //$NON-NLS-2$ + "ag.carnot.workflow.spi.providers.data.java.Type", "long"); //$NON-NLS-1$ //$NON-NLS-2$ DataType currentDate = createData(model, dataType0, PredefinedConstants.CURRENT_DATE, Diagram_Messages.NAME_CurrentDate, Diagram_Messages.DESC_CurrentDate); - createAttribute(currentDate, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(currentDate, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(currentDate, PredefinedConstants.TYPE_ATT, - "ag.carnot.workflow.spi.providers.data.java.Type", "Calendar"); //$NON-NLS-1$ //$NON-NLS-2$ + "ag.carnot.workflow.spi.providers.data.java.Type", "Calendar"); //$NON-NLS-1$ //$NON-NLS-2$ DataType currentLocale = createData(model, dataType0, PredefinedConstants.CURRENT_LOCALE, Diagram_Messages.NAME_CurrentLocale, Diagram_Messages.DESC_CurrentLocale); - createAttribute(currentLocale, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(currentLocale, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(currentLocale, PredefinedConstants.TYPE_ATT, - "ag.carnot.workflow.spi.providers.data.java.Type", "String"); //$NON-NLS-1$ //$NON-NLS-2$ + "ag.carnot.workflow.spi.providers.data.java.Type", "String"); //$NON-NLS-1$ //$NON-NLS-2$ DataType currentModel = createData(model, dataType1, PredefinedConstants.CURRENT_MODEL, Diagram_Messages.NAME_CurrentModel, Diagram_Messages.DESC_CurrentModel); - createAttribute(currentModel, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + createAttribute(currentModel, PredefinedConstants.BROWSABLE_ATT, "boolean", "true"); //$NON-NLS-1$ //$NON-NLS-2$ createAttribute(currentModel, PredefinedConstants.CLASS_NAME_ATT, null, - "org.eclipse.stardust.engine.api.runtime.DeployedModelDescription"); //$NON-NLS-1$ + "org.eclipse.stardust.engine.api.runtime.DeployedModelDescription"); //$NON-NLS-1$ } - + private void createDefaultCriticalityAttributes(ModelType model) { VariableContextHelper.getInstance().createContext(model); @@ -424,9 +416,9 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard modelVariable = new ModelVariable("${MHigh}", "10", //$NON-NLS-1$ //$NON-NLS-2$ Diagram_Messages.CRITICALITY_MULTIPLE_TARGET_EXECUTION_HIGH); context.createAttributeSet(modelVariable, 6); - + //Default criticality formula - String formula = + String formula = "if(activityInstance.getActivity().getTargetExecutionTime() == 0)\n" + //$NON-NLS-1$ "{\n" + //$NON-NLS-1$ " T = ${TDefault};\n" + //$NON-NLS-1$ @@ -524,7 +516,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard private void createDefaultTypes(ModelType model) { model.setTypeDeclarations(XpdlFactory.eINSTANCE.createTypeDeclarationsType()); - + addMetaTypes(model, defaultDataTypes, CarnotConstants.DATA_TYPES_EXTENSION_POINT_ID, CarnotWorkflowModelPackage.eINSTANCE.getDataTypeType(), @@ -588,32 +580,32 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard { CarnotWorkflowModelFactory factory = CarnotWorkflowModelFactory.eINSTANCE; DiagramType diagram = factory.createDiagramType(); - + diagram.setName(Diagram_Messages.NAME_DefaultDiagram); String modelingDirection; // in case the PreferenceStore is not initialized if(pStore.contains(BpmProjectNature.PREFERENCE_MODELING_DIRECTION)) { - modelingDirection = pStore.getString(BpmProjectNature.PREFERENCE_MODELING_DIRECTION); + modelingDirection = pStore.getString(BpmProjectNature.PREFERENCE_MODELING_DIRECTION); } else { - modelingDirection = BpmProjectNature.DEFAULT_PREFERENCE_MODELING_DIRECTION; - } + modelingDirection = BpmProjectNature.DEFAULT_PREFERENCE_MODELING_DIRECTION; + } diagram.setOrientation(OrientationType.VERTICAL_LITERAL.toString().equals(modelingDirection) ? OrientationType.VERTICAL_LITERAL - : OrientationType.HORIZONTAL_LITERAL); + : OrientationType.HORIZONTAL_LITERAL); DiagramModeType defaultMode; boolean classicMode; if(pStore.contains(BpmProjectNature.PREFERENCE_CLASSIC_MODE)) { - classicMode = pStore.getBoolean(BpmProjectNature.PREFERENCE_CLASSIC_MODE); + classicMode = pStore.getBoolean(BpmProjectNature.PREFERENCE_CLASSIC_MODE); } else { - classicMode = BpmProjectNature.DEFAULT_PREFERENCE_CLASSIC_MODE; - } + classicMode = BpmProjectNature.DEFAULT_PREFERENCE_CLASSIC_MODE; + } if (classicMode) { defaultMode = DiagramModeType.MODE_400_LITERAL; @@ -623,7 +615,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard defaultMode = DiagramModeType.MODE_450_LITERAL; } diagram.setMode(defaultMode); - + // emulate old DefDesk behavior, starting default element OIDs at 10001 diagram.setElementOid(Math.max(ModelUtils.getElementOid(diagram, model), 10001)); @@ -648,7 +640,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard model.setVendor(Diagram_Messages.LBL_CARNOT_AG); model.setModelOID(0); - + ScriptType script = XpdlFactory.eINSTANCE.createScriptType(); script.setType("text/ecmascript"); //$NON-NLS-1$ model.setScript(script); @@ -711,8 +703,8 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard IProject project = createNewProject(root); resource = root.findMember(new Path(project.getName())); } -// this check is already done in NewWorkflowDiagramWizardPage -/* +// this check is already done in NewWorkflowDiagramWizardPage +/* if (!resource.exists() || !(resource instanceof IContainer)) { IStatus status = new Status(IStatus.ERROR, CarnotConstants.DIAGRAM_PLUGIN_ID, @@ -720,8 +712,8 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard + Diagram_Messages.STATUS_P2_doesNotExist, null); throw new CoreException(status); } - else -*/ + else +*/ if (!resource.isAccessible()) { IStatus status = new Status(IStatus.ERROR, CarnotConstants.DIAGRAM_PLUGIN_ID, @@ -758,7 +750,7 @@ public class NewWorkflowDiagramWizard extends Wizard implements INewWizard /** * We will accept the selection in the workbench to see if we can initialize from it. - * + * * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection) */ public void init(IWorkbench workbench, IStructuredSelection selection) diff --git a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizardPage.java b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizardPage.java index 18595f4..0dc59be 100644 --- a/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizardPage.java +++ b/modeling/org.eclipse.stardust.modeling.core/src/org/eclipse/stardust/modeling/core/wizards/NewWorkflowDiagramWizardPage.java @@ -21,10 +21,6 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.stardust.common.StringUtils; -import org.eclipse.stardust.model.xpdl.carnot.util.ModelUtils; -import org.eclipse.stardust.modeling.core.DiagramPlugin; -import org.eclipse.stardust.modeling.core.Diagram_Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -38,6 +34,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ContainerSelectionDialog; +import org.eclipse.stardust.common.StringUtils; +import org.eclipse.stardust.model.xpdl.carnot.util.ModelUtils; +import org.eclipse.stardust.modeling.core.Diagram_Messages; + /** * The "New" wizard page allows setting the container for the new file as well as the file * name. The page will only accept file name without the extension OR with the extension @@ -57,11 +57,11 @@ public class NewWorkflowDiagramWizardPage extends WizardPage // enable finish button private boolean completePage = true; // is there an open project - private boolean currentProject = true; + private boolean currentProject = true; /** * Constructor for SampleNewWizardPage. - * + * * @param selection */ public NewWorkflowDiagramWizardPage(ISelection selection) @@ -70,26 +70,26 @@ public class NewWorkflowDiagramWizardPage extends WizardPage setTitle(Diagram_Messages.TITLE_NewCarnotWorkflowModel); setDescription(Diagram_Messages.DESC_CarnotWizard); this.selection = selection; - + // no current projekt if (ResourcesPlugin.getWorkspace().getRoot().getProjects().length == 0) { - currentProject = false; - } + currentProject = false; + } } /** * @see IDialogPage#createControl(Composite) */ public void createControl(Composite parent) - { + { Composite container = new Composite(parent, SWT.NULL); GridLayout layout = new GridLayout(); container.setLayout(layout); layout.numColumns = 3; layout.verticalSpacing = 9; -/* +/* final Label lblModelId = new Label(container, SWT.NULL); lblModelId.setText(Diagram_Messages.LB_ModelAndId); @@ -106,14 +106,14 @@ public class NewWorkflowDiagramWizardPage extends WizardPage txtModelId.setText("New_Workflow_Model"); //$NON-NLS-1$ // ending line with blind label new Label(container, SWT.NULL); -*/ +*/ final Label lblModelName = new Label(container, SWT.NULL); lblModelName.setText(Diagram_Messages.LB_ModelAndName); final Text txtModelName = new Text(container, SWT.BORDER | SWT.SINGLE); txtModelName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); -/* +/* txtModelName.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) @@ -124,7 +124,7 @@ public class NewWorkflowDiagramWizardPage extends WizardPage } }); txtModelName.setText(Diagram_Messages.LB_NewWorkflowModel); -*/ +*/ // ending line with blind label new Label(container, SWT.NULL); @@ -149,7 +149,7 @@ public class NewWorkflowDiagramWizardPage extends WizardPage final Text txtFolder = new Text(container, SWT.BORDER | SWT.SINGLE); GridData gd = new GridData(GridData.FILL_HORIZONTAL); txtFolder.setLayoutData(gd); -/* +/* txtFolder.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) @@ -158,7 +158,7 @@ public class NewWorkflowDiagramWizardPage extends WizardPage dialogChanged(); } }); -*/ +*/ Button btnBrowsFolder = new Button(container, SWT.PUSH); btnBrowsFolder.setText(Diagram_Messages.TXT_Browse); @@ -175,7 +175,7 @@ public class NewWorkflowDiagramWizardPage extends WizardPage { btnBrowsFolder.setEnabled(false); } - + final Button btnAdvanced = new Button(container, SWT.PUSH); btnAdvanced.setText(Diagram_Messages.TXT_AdvancedRight); // ending line with blind label @@ -190,8 +190,8 @@ public class NewWorkflowDiagramWizardPage extends WizardPage layoutPnlAdvanced.numColumns = 2; layoutPnlAdvanced.verticalSpacing = 9; -// - +// + final Label lblModelId = new Label(pnlAdvanced, SWT.NULL); lblModelId.setText(Diagram_Messages.LB_ModelAndId); @@ -215,7 +215,7 @@ public class NewWorkflowDiagramWizardPage extends WizardPage dialogChanged(); } }); - + txtModelName.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) @@ -229,17 +229,17 @@ public class NewWorkflowDiagramWizardPage extends WizardPage // no current project if (currentProject == false) - { + { txtFolder.setEnabled(false); } else { initializeSelection(txtFolder); } - - + + // - + final Label lblAuthor = new Label(pnlAdvanced, SWT.NULL); lblAuthor.setText(Diagram_Messages.TXT_Author); @@ -294,8 +294,8 @@ public class NewWorkflowDiagramWizardPage extends WizardPage }); if(!completePage) - { - setPageComplete(false); + { + setPageComplete(false); } setControl(container); } @@ -377,24 +377,20 @@ public class NewWorkflowDiagramWizardPage extends WizardPage new Path(getContainerName())); String message = null; // root is selected - - boolean isRoot = container == null || container.getProject() == null; - + + boolean isRoot = container == null || container.getProject() == null; + // there is a current project open but no container name typed in if(containerName.length() == 0 && currentProject) { - // only in developer mode - if(!DiagramPlugin.isBusinessPerspective()) - { - message = Diagram_Messages.NewWorkflowDiagramWizardPage_MSG_FolderMustNotBeEmpty; - } + message = Diagram_Messages.NewWorkflowDiagramWizardPage_MSG_FolderMustNotBeEmpty; } // there is a current project open but no valid container selected - else if (currentProject && (container == null || !(container instanceof IContainer) + else if (currentProject && (container == null || !(container instanceof IContainer) || isRoot)) { - message = Diagram_Messages.MSG_FolderMustExist; - } + message = Diagram_Messages.MSG_FolderMustExist; + } // if (containerName.length() == 0) // { // message = Diagram_Messages.MSG_FolderForNewModelMustBeSpecified; @@ -440,11 +436,11 @@ public class NewWorkflowDiagramWizardPage extends WizardPage setErrorMessage(message); if(completePage == true) { - setPageComplete(message == null); + setPageComplete(message == null); } else { - setPageComplete(false); + setPageComplete(false); } } diff --git a/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml b/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml index 58bd6fe..28f2b4c 100644 --- a/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.data.structured/plugin.xml @@ -6,30 +6,29 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> <plugin> <extension-point id="applicationInfo" name="Application Info" schema="schema/applicationInfo.exsd"/> - + <extension point="org.eclipse.stardust.modeling.validation.modelValidator"> <modelValidator id="org.eclipse.stardust.modeling.data.structured.validation.modelValidator" class="org.eclipse.stardust.modeling.data.structured.validation.ModelValidator" targetType="org.eclipse.stardust.model.xpdl.carnot.ModelType"/> </extension> - + <extension point="org.eclipse.stardust.modeling.validation.modelElementValidator"> <modelElementValidator id="org.eclipse.stardust.modeling.data.structured.validation.dataValidator" class="org.eclipse.stardust.modeling.data.structured.validation.DataValidator" metaTypeId="struct" targetType="org.eclipse.stardust.model.xpdl.carnot.DataType"> <filter name="metaType" value="struct"/> - <filter name="!perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> </extension> - + <extension point="org.eclipse.stardust.modeling.validation.bridgeObjectProvider"> <bridgeObjectProvider id="struct.bridge.object.provider" class="org.eclipse.stardust.modeling.data.structured.validation.StructBridgeObjectProvider" @@ -87,11 +86,11 @@ <element name="InputPreferences_style" empty="false" label="%cssStyle" - type="string"/> + type="string"/> <element name="InputPreferences_styleClass" empty="false" label="%cssStyleClass" - type="string"/> + type="string"/> <element name="InputPreferences_prefixKey" empty="false" label="%prefixI18NKey" @@ -146,9 +145,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.DataType"/> <test property="com.infinity.properties.metaType" value="struct"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> diff --git a/modeling/org.eclipse.stardust.modeling.integration.dms/plugin.xml b/modeling/org.eclipse.stardust.modeling.integration.dms/plugin.xml index 7f8608e..4669056 100644 --- a/modeling/org.eclipse.stardust.modeling.integration.dms/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.integration.dms/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -176,9 +176,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.DataType"/> <test property="com.infinity.properties.metaType" value="dmsDocument"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> @@ -192,9 +189,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.DataType"/> <test property="com.infinity.properties.metaType" value="dmsDocumentList"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> @@ -208,9 +202,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.DataType"/> <test property="com.infinity.properties.metaType" value="dmsFolder"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> @@ -224,9 +215,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.DataType"/> <test property="com.infinity.properties.metaType" value="dmsFolderList"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> diff --git a/modeling/org.eclipse.stardust.modeling.integration.ejb30/plugin.xml b/modeling/org.eclipse.stardust.modeling.integration.ejb30/plugin.xml index 7e3ce81..ada491b 100644 --- a/modeling/org.eclipse.stardust.modeling.integration.ejb30/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.integration.ejb30/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -21,9 +21,6 @@ <filter name="metaType" value="sessionBean30"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.integration.ejb30.entity.EntityBean30Validator" @@ -32,9 +29,6 @@ <filter name="metaType" value="entity30"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> </extension> <extension @@ -49,9 +43,6 @@ <filter name="metaType" value="sessionBean30"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> <page category="spi" @@ -63,9 +54,6 @@ <filter name="metaType" value="entity30"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> </extension> </plugin> diff --git a/modeling/org.eclipse.stardust.modeling.integration.mail/plugin.xml b/modeling/org.eclipse.stardust.modeling.integration.mail/plugin.xml index 55238b6..469e054 100644 --- a/modeling/org.eclipse.stardust.modeling.integration.mail/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.integration.mail/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -52,9 +52,6 @@ <and> <instanceof value="org.eclipse.stardust.model.xpdl.carnot.ApplicationType"/> <test property="com.infinity.properties.metaType" value="mailBean"/> - <not> - <test property="com.infinity.properties.perspectiveType" value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </not> </and> </enabledWhen> </page> diff --git a/modeling/org.eclipse.stardust.modeling.integration.spring/plugin.xml b/modeling/org.eclipse.stardust.modeling.integration.spring/plugin.xml index 6847e8b..110380c 100644 --- a/modeling/org.eclipse.stardust.modeling.integration.spring/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.integration.spring/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -39,9 +39,6 @@ <filter name="metaType" value="springBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> </extension> <extension @@ -56,9 +53,6 @@ <filter name="metaType" value="springBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> </extension> </plugin> diff --git a/modeling/org.eclipse.stardust.modeling.transformation/plugin.xml b/modeling/org.eclipse.stardust.modeling.transformation/plugin.xml index 48bc91a..e69e1c3 100644 --- a/modeling/org.eclipse.stardust.modeling.transformation/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.transformation/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -87,7 +87,7 @@ id="contexts" name="%extensionName" point="org.eclipse.stardust.modeling.core.contextTypes"> - <context + <context accessPointProvider="org.eclipse.stardust.modeling.transformation.modeling.externalwebapp.spi.context.ExternalWebappAccessPointProvider" icon="icons/full/obj16/externalWebApp_context_icon.gif" hasApplicationPath="true" @@ -136,9 +136,6 @@ <filter name="metaType" value="externalWebApp"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> </extension> <extension @@ -152,9 +149,6 @@ <filter name="metaType" value="messageTransformationBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> </extension> <extension @@ -168,9 +162,6 @@ <filter name="metaType" value="xslMessageTransformationBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> </extension> <extension @@ -184,9 +175,6 @@ <filter name="metaType" value="messageParsingBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> </extension> <extension @@ -200,11 +188,8 @@ <filter name="metaType" value="messageSerializationBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </page> - </extension> + </extension> <extension point="org.eclipse.ui.ide.resourceFilters"> <filter selected="true" pattern="knitt*.js"></filter> </extension> diff --git a/modeling/org.eclipse.stardust.modeling.validation/plugin.xml b/modeling/org.eclipse.stardust.modeling.validation/plugin.xml index a0e8f89..e715fd5 100644 --- a/modeling/org.eclipse.stardust.modeling.validation/plugin.xml +++ b/modeling/org.eclipse.stardust.modeling.validation/plugin.xml @@ -6,7 +6,7 @@ are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html - + Contributors: SunGard CSA LLC - initial API and implementation and/or initial documentation --> @@ -55,10 +55,10 @@ class="org.eclipse.stardust.modeling.validation.impl.QualityAssuranceCodeValidator" id="org.eclipse.stardust.modeling.validation.qualityassurancecode" targetType="org.eclipse.stardust.model.xpdl.carnot.ModelType"> - </modelValidator> + </modelValidator> </extension> - - + + <extension point="org.eclipse.stardust.modeling.validation.modelElementValidator"> @@ -80,9 +80,6 @@ <filter name="metaType" value="jms"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.triggerTypes.MailTriggerValidator" @@ -92,9 +89,6 @@ <filter name="metaType" value="mail"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.triggerTypes.ManualTriggerValidator" @@ -104,9 +98,6 @@ <filter name="metaType" value="manual"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.triggerTypes.ManualTriggerValidator" @@ -116,9 +107,6 @@ <filter name="metaType" value="scan"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.triggerTypes.TimerTriggerValidator" @@ -128,9 +116,6 @@ <filter name="metaType" value="timer"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator @@ -146,9 +131,6 @@ <filter name="metaType" value="jms"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.applicationTypes.PlainJavaValidator" @@ -158,9 +140,6 @@ <filter name="metaType" value="plainJava"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.applicationTypes.SessionBeanValidator" @@ -170,9 +149,6 @@ <filter name="metaType" value="sessionBean"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.applicationTypes.SessionBean20Validator" @@ -182,9 +158,6 @@ <filter name="metaType" value="sessionBean20"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.applicationTypes.WebserviceApplicationValidator" @@ -194,9 +167,6 @@ <filter name="metaType" value="webservice"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator @@ -204,21 +174,7 @@ id="org.eclipse.stardust.modeling.validation.dataDefault" targetType="org.eclipse.stardust.model.xpdl.carnot.DataType"> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </modelElementValidator> - - <modelElementValidator - class="org.eclipse.stardust.modeling.validation.impl.SimplifiedDataValidator" - id="org.eclipse.stardust.modeling.validation.dataSimplified" - targetType="org.eclipse.stardust.model.xpdl.carnot.DataType"> - - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> - <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.dataTypes.EntityBeanValidator" id="org.eclipse.stardust.modeling.validation.entityBeanData" @@ -227,9 +183,6 @@ <filter name="metaType" value="entity"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.dataTypes.EntityBean20Validator" @@ -239,9 +192,6 @@ <filter name="metaType" value="entity20"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.dataTypes.PrimitiveValidator" @@ -251,9 +201,6 @@ <filter name="metaType" value="primitive"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.dataTypes.SerializableValidator" @@ -263,9 +210,6 @@ <filter name="metaType" value="serializable"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.dataTypes.XMLValidator" @@ -275,9 +219,6 @@ <filter name="metaType" value="plainXML"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator @@ -288,9 +229,6 @@ <filter name="metaType" value="jfc"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.spi.contextTypes.JSPValidator" @@ -300,37 +238,19 @@ <filter name="metaType" value="jsp"/> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.DefaultActivityValidator" id="org.eclipse.stardust.modeling.validation.activityDefault" targetType="org.eclipse.stardust.model.xpdl.carnot.ActivityType"> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> <modelElementValidator - class="org.eclipse.stardust.modeling.validation.impl.SimplifiedActivityValidator" - id="org.eclipse.stardust.modeling.validation.activitySimplified" - targetType="org.eclipse.stardust.model.xpdl.carnot.ActivityType"> - <filter - name="perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> - </modelElementValidator> - - <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.DataMappingValidator" id="org.eclipse.stardust.modeling.validation.dataMapping" targetType="org.eclipse.stardust.model.xpdl.carnot.DataMappingType"> - <filter - name="!perspectiveType" - value="ag.carnot.workflow.modeler.businessModelingPerspective"/> </modelElementValidator> - + <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.DataPathValidator" id="org.eclipse.stardust.modeling.validation.dataPath" @@ -345,7 +265,7 @@ class="org.eclipse.stardust.modeling.validation.impl.DefaultProcessDefinitionValidator" id="org.eclipse.stardust.modeling.validation.processDefinition" targetType="org.eclipse.stardust.model.xpdl.carnot.ProcessDefinitionType"/> - + <modelElementValidator class="org.eclipse.stardust.modeling.validation.impl.EventHandlerValidator" id="org.eclipse.stardust.modeling.validation.eventHandler" diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/SimplifiedActivityValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/SimplifiedActivityValidator.java deleted file mode 100644 index f21204b..0000000 --- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/SimplifiedActivityValidator.java +++ b/dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 SunGard CSA LLC and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * SunGard CSA LLC - initial API and implementation and/or initial documentation - *******************************************************************************/ -package org.eclipse.stardust.modeling.validation.impl; - -public class SimplifiedActivityValidator extends DefaultActivityValidator -{ - protected boolean performFullCheck() - { - return false; - } -} diff --git a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/SimplifiedDataValidator.java b/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/SimplifiedDataValidator.java deleted file mode 100644 index e4250e1..0000000 --- a/modeling/org.eclipse.stardust.modeling.validation/src/org/eclipse/stardust/modeling/validation/impl/SimplifiedDataValidator.java +++ b/dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 SunGard CSA LLC and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * SunGard CSA LLC - initial API and implementation and/or initial documentation - *******************************************************************************/ -package org.eclipse.stardust.modeling.validation.impl; - -/** - * @author rsauer - * @version $Revision$ - */ -public class SimplifiedDataValidator extends DefaultDataValidator -{ - protected boolean fullCheck() - { - return false; - } -} |