summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-09-04 04:30:58 (EDT)
committer Stephan Born2012-09-04 04:30:58 (EDT)
commitf0af72d876cd8fe7d44c8cb3088ccb1cf35d6863 (patch)
tree672d930c1dd1e50c7d7ca7ec564f5e743589a5fb
parentc0e4b7b8c4d3c2bddee6835a047df1c21354730f (diff)
downloadorg.eclipse.stardust.ide.wst-f0af72d876cd8fe7d44c8cb3088ccb1cf35d6863.zip
org.eclipse.stardust.ide.wst-f0af72d876cd8fe7d44c8cb3088ccb1cf35d6863.tar.gz
org.eclipse.stardust.ide.wst-f0af72d876cd8fe7d44c8cb3088ccb1cf35d6863.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.wst@58890 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--org.eclipse.stardust.ide.wst.modeling.app.jsf/plugin.xml7
-rw-r--r--org.eclipse.stardust.ide.wst.modeling.app.jsf/src/org/eclipse/stardust/ide/wst/modeling/app/jsf/actions/ConvertToJSFActivityAction.java33
2 files changed, 18 insertions, 22 deletions
diff --git a/org.eclipse.stardust.ide.wst.modeling.app.jsf/plugin.xml b/org.eclipse.stardust.ide.wst.modeling.app.jsf/plugin.xml
index 08547cc..4212b18 100644
--- a/org.eclipse.stardust.ide.wst.modeling.app.jsf/plugin.xml
+++ b/org.eclipse.stardust.ide.wst.modeling.app.jsf/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
-->
@@ -37,9 +37,6 @@
<filter
name="metaType"
value="jsf"/>
- <filter
- name="!perspectiveType"
- value="ag.carnot.workflow.modeler.businessModelingPerspective"/>
</modelElementValidator>
</extension>
<extension
@@ -52,4 +49,4 @@
</extension>
</plugin>
-
+
diff --git a/org.eclipse.stardust.ide.wst.modeling.app.jsf/src/org/eclipse/stardust/ide/wst/modeling/app/jsf/actions/ConvertToJSFActivityAction.java b/org.eclipse.stardust.ide.wst.modeling.app.jsf/src/org/eclipse/stardust/ide/wst/modeling/app/jsf/actions/ConvertToJSFActivityAction.java
index 157ebc4..b28318a 100644
--- a/org.eclipse.stardust.ide.wst.modeling.app.jsf/src/org/eclipse/stardust/ide/wst/modeling/app/jsf/actions/ConvertToJSFActivityAction.java
+++ b/org.eclipse.stardust.ide.wst.modeling.app.jsf/src/org/eclipse/stardust/ide/wst/modeling/app/jsf/actions/ConvertToJSFActivityAction.java
@@ -84,9 +84,8 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
{
WorkflowModelEditor editor = GenericUtils.getWorkflowModelEditor(ModelUtils.findContainingModel(activity));
if (!editor.getModelServer().requireLock(activity))
- {
- return !DiagramPlugin.isBusinessPerspective()
- && super.isEnabled()
+ {
+ return super.isEnabled()
&& (null != activity)
&& (ActivityImplementationType.MANUAL_LITERAL.equals(activity
.getImplementation()));
@@ -98,10 +97,10 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
protected Command doRunCommand()
{
// any change will be recorded and automatically made undoable
-
+
CompoundCommand cmd = null;
int returnCode = Window.CANCEL;
-
+
ActivityType activity = getSelectedActivity();
if (activity != null)
{
@@ -114,22 +113,22 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
{
registry = graphicalViewer.getEditPartRegistry();
}
-
+
JSFGuiGenerationWizard jsfWizard =
new JSFGuiGenerationWizard(activity, symbol, registry);
WizardDialog w = new WizardDialog(PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getShell(), jsfWizard);
w.setBlockOnOpen(true);
- w.open();
+ w.open();
returnCode = w.getReturnCode();
-
+
if(returnCode == Window.OK && symbol != null)
{
WorkflowModelEditor editor = (WorkflowModelEditor) PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-
+
DiagramType diagram = ModelUtils.findContainingDiagram(symbol);
-
+
PoolSymbol pool = DiagramUtil.getDefaultPool(diagram);
ISymbolContainer container;
if(pool == null)
@@ -139,10 +138,10 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
else
{
container = (ISymbolContainer) symbol.eContainer();
- }
+ }
final EditPart targetEditPart = editor.findEditPart(container);
if(targetEditPart instanceof AbstractSwimlaneEditPart)
- {
+ {
cmd = new CompoundCommand();
cmd.add(new DelegatingCommand()
{
@@ -151,15 +150,15 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
return PoolLaneUtils.resizeLane((AbstractSwimlaneEditPart) targetEditPart);
}
});
- // here children of siblings must be ordered (if there are any)
+ // here children of siblings must be ordered (if there are any)
cmd.add(new DelegatingCommand()
{
public Command createDelegate()
{
return PoolLaneUtils.reorderSiblings(targetEditPart, null);
}
- });
- }
+ });
+ }
}
}
}
@@ -177,7 +176,7 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
}
catch (CoreException e)
{
-
+
ErrorDialog.openError(graphicalViewer.getControl().getShell(),
JSF_Messages.DIA_ERROR_ERROR, JSF_Messages.DIA_ERROR_CANNOT_CONVERT_ACTIVITY, e.getStatus());
return false;
@@ -308,7 +307,7 @@ public class ConvertToJSFActivityAction extends AbstractUndoableAction
return project;
}
-
+
private ActivityType getSelectedActivity()
{
ActivityType activity = null;