Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
regenerated some code
Browse files Browse the repository at this point in the history 
got workbench hosted forms project running on dev
resolved session form model issue
resolved jvm 1.6 target issues
  • Loading branch information
@gregjan
gregjan committed Oct 31, 2012
1 parent e00f7d8 commit fa165a9
Show file tree
Hide file tree
Showing 206 changed files with 6,484 additions and 11,207 deletions.
2 changes: 1 addition & 1 deletion crosswalk-gmf.diagram/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
Bundle-SymbolicName: crosswalk-gmf.diagram; singleton:=true Bundle-SymbolicName: crosswalk-gmf.diagram; singleton:=true
Bundle-Version: 4.0.0.qualifier Bundle-Version: 4.0.1.qualifier
Bundle-ClassPath: .,juniversalchardet-1.0.3.jar Bundle-ClassPath: .,juniversalchardet-1.0.3.jar
Bundle-Activator: crosswalk.diagram.part.CrosswalkDiagramEditorPlugin Bundle-Activator: crosswalk.diagram.part.CrosswalkDiagramEditorPlugin
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
Expand Down
19 changes: 1 addition & 18 deletions crosswalk-gmf.diagram/plugin.xml
View file
Expand Up @@ -256,24 +256,7 @@ copyright 2010 University of North Carolina at Chapel Hill
<object class="crosswalk.diagram.edit.parts.CrossWalkEditPart" id="CrossWalk_2001"/> <object class="crosswalk.diagram.edit.parts.CrossWalkEditPart" id="CrossWalk_2001"/>
<object class="crosswalk.diagram.edit.parts.DictionaryEditPart" id="Dictionary_2002"/> <object class="crosswalk.diagram.edit.parts.DictionaryEditPart" id="Dictionary_2002"/>
<object class="crosswalk.diagram.edit.parts.FormEditPart" id="Form_2003"/> <object class="crosswalk.diagram.edit.parts.FormEditPart" id="Form_2003"/>
<object class="crosswalk.diagram.edit.parts.DelimitedFileEditPart" id="DelimitedFile_3001"/> <context elements="EditingContainer_1000,CrossWalk_2001,Dictionary_2002,Form_2003"/>
<object class="crosswalk.diagram.edit.parts.TabbedDataFieldEditPart" id="TabbedDataField_3002"/>
<object class="crosswalk.diagram.edit.parts.OriginalNameRecordMatcherEditPart" id="OriginalNameRecordMatcher_3003"/>
<object class="crosswalk.diagram.edit.parts.DateRecognizerEditPart" id="DateRecognizer_3004"/>
<object class="crosswalk.diagram.edit.parts.TextEditPart" id="Text_3005"/>
<object class="crosswalk.diagram.edit.parts.TrimWhitespaceEditPart" id="TrimWhitespace_3006"/>
<object class="crosswalk.diagram.edit.parts.MappedElementEditPart" id="MappedElement_3007"/>
<object class="crosswalk.diagram.edit.parts.MappedElement2EditPart" id="MappedElement_3008"/>
<object class="crosswalk.diagram.edit.parts.MappedAttributeEditPart" id="MappedAttribute_3009"/>
<object class="crosswalk.diagram.edit.parts.MetadataBlock2EditPart" id="MetadataBlock_3018"/>
<object class="crosswalk.diagram.edit.parts.TextInputFieldEditPart" id="TextInputField_3023"/>
<object class="crosswalk.diagram.edit.parts.CurrentDateEditPart" id="CurrentDate_3021"/>
<object class="crosswalk.diagram.edit.parts.CurrentUsernameEditPart" id="CurrentUsername_3022"/>
<object class="crosswalk.diagram.edit.parts.DateInputFieldEditPart" id="DateInputField_3024"/>
<object class="crosswalk.diagram.edit.parts.MetadataBlockEditPart" id="MetadataBlock_3010"/>
<object class="crosswalk.diagram.edit.parts.MetadataBlock3EditPart" id="MetadataBlock_3019"/>
<object class="crosswalk.diagram.edit.parts.ParagraphEditPart" id="Paragraph_3020"/>
<context elements="EditingContainer_1000,CrossWalk_2001,Dictionary_2002,Form_2003,DelimitedFile_3001,TabbedDataField_3002,OriginalNameRecordMatcher_3003,DateRecognizer_3004,Text_3005,TrimWhitespace_3006,MappedElement_3007,MappedElement_3008,MappedAttribute_3009,MetadataBlock_3018,TextInputField_3023,CurrentDate_3021,CurrentUsername_3022,DateInputField_3024,MetadataBlock_3010,MetadataBlock_3019,Paragraph_3020"/>
</modelingAssistantProvider> </modelingAssistantProvider>
</extension> </extension>


Expand Down
2 changes: 1 addition & 1 deletion crosswalk-gmf.diagram/src/crosswalk/diagram/custom/CompartmentChildCreateCommand.java
View file
Expand Up @@ -7,9 +7,9 @@
import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.diagram.core.services.ViewService; import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand; import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
import org.eclipse.gmf.runtime.notation.View; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.util.Assert; import org.eclipse.jface.util.Assert;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;


public class CompartmentChildCreateCommand extends CreateCommand { public class CompartmentChildCreateCommand extends CreateCommand {
int index; int index;
Expand Down
1 change: 1 addition & 0 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/custom/DictionaryPreference.java
View file
Expand Up @@ -2,6 +2,7 @@


import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.URI;


import crosswalk.diagram.part.CrosswalkDiagramEditorPlugin; import crosswalk.diagram.part.CrosswalkDiagramEditorPlugin;
Expand Down
1 change: 0 additions & 1 deletion crosswalk-gmf.diagram/src/crosswalk/diagram/custom/ReorderCompartmentEditPolicy.java
View file
@@ -1,6 +1,5 @@
package crosswalk.diagram.custom; package crosswalk.diagram.custom;


import org.eclipse.draw2d.PositionConstants;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.TransactionalEditingDomain;
Expand Down
1 change: 0 additions & 1 deletion crosswalk-gmf.diagram/src/crosswalk/diagram/custom/ReplaceNewObjectWithTemplateCommand.java
View file
Expand Up @@ -9,7 +9,6 @@
import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand; import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;


Expand Down
22 changes: 8 additions & 14 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/CrossWalkCreateCommand.java
View file
Expand Up @@ -33,8 +33,7 @@ public CrossWalkCreateCommand(CreateElementRequest req) {
* @generated * @generated
*/ */
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -56,8 +55,7 @@ public boolean canExecute() {
/** /**
* @generated * @generated
*/ */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException {
CrossWalk newElement = CrosswalkFactory.eINSTANCE.createCrossWalk(); CrossWalk newElement = CrosswalkFactory.eINSTANCE.createCrossWalk();


EditingContainer owner = (EditingContainer) getElementToEdit(); EditingContainer owner = (EditingContainer) getElementToEdit();
Expand All @@ -72,17 +70,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(CrossWalk newElement, IProgressMonitor monitor, protected void doConfigure(CrossWalk newElement, IProgressMonitor monitor, IAdaptable info)
IAdaptable info) throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down
21 changes: 7 additions & 14 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/CurrentDateCreateCommand.java
View file
Expand Up @@ -33,8 +33,7 @@ public CurrentDateCreateCommand(CreateElementRequest req) {
* @generated * @generated
*/ */
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -52,8 +51,7 @@ public boolean canExecute() {
/** /**
* @generated * @generated
*/ */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException {
CurrentDate newElement = CrosswalkFactory.eINSTANCE.createCurrentDate(); CurrentDate newElement = CrosswalkFactory.eINSTANCE.createCurrentDate();


MappingContainer owner = (MappingContainer) getElementToEdit(); MappingContainer owner = (MappingContainer) getElementToEdit();
Expand All @@ -68,18 +66,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(CurrentDate newElement, protected void doConfigure(CurrentDate newElement, IProgressMonitor monitor, IAdaptable info)
IProgressMonitor monitor, IAdaptable info)
throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down
24 changes: 8 additions & 16 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/CurrentUsernameCreateCommand.java
View file
Expand Up @@ -33,8 +33,7 @@ public CurrentUsernameCreateCommand(CreateElementRequest req) {
* @generated * @generated
*/ */
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -52,10 +51,8 @@ public boolean canExecute() {
/** /**
* @generated * @generated
*/ */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException { CurrentUsername newElement = CrosswalkFactory.eINSTANCE.createCurrentUsername();
CurrentUsername newElement = CrosswalkFactory.eINSTANCE
.createCurrentUsername();


MappingContainer owner = (MappingContainer) getElementToEdit(); MappingContainer owner = (MappingContainer) getElementToEdit();
owner.getWidgets().add(newElement); owner.getWidgets().add(newElement);
Expand All @@ -69,18 +66,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(CurrentUsername newElement, protected void doConfigure(CurrentUsername newElement, IProgressMonitor monitor, IAdaptable info)
IProgressMonitor monitor, IAdaptable info)
throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down
24 changes: 8 additions & 16 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/DateInputFieldCreateCommand.java
View file
Expand Up @@ -33,8 +33,7 @@ public DateInputFieldCreateCommand(CreateElementRequest req) {
* @generated * @generated
*/ */
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -52,10 +51,8 @@ public boolean canExecute() {
/** /**
* @generated * @generated
*/ */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException { DateInputField newElement = CrosswalkFactory.eINSTANCE.createDateInputField();
DateInputField newElement = CrosswalkFactory.eINSTANCE
.createDateInputField();


MetadataBlock owner = (MetadataBlock) getElementToEdit(); MetadataBlock owner = (MetadataBlock) getElementToEdit();
owner.getPorts().add(newElement); owner.getPorts().add(newElement);
Expand All @@ -69,18 +66,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(DateInputField newElement, protected void doConfigure(DateInputField newElement, IProgressMonitor monitor, IAdaptable info)
IProgressMonitor monitor, IAdaptable info)
throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down
25 changes: 8 additions & 17 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/DateRecognizerCreateCommand.java
View file
Expand Up @@ -27,7 +27,6 @@
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.gmf.runtime.notation.View; import org.eclipse.gmf.runtime.notation.View;


import crosswalk.CrossWalk;
import crosswalk.CrosswalkFactory; import crosswalk.CrosswalkFactory;
import crosswalk.DateRecognizer; import crosswalk.DateRecognizer;
import crosswalk.MappingContainer; import crosswalk.MappingContainer;
Expand All @@ -50,8 +49,7 @@ public DateRecognizerCreateCommand(CreateElementRequest req) {
*/ */
@Override @Override
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -71,10 +69,8 @@ public boolean canExecute() {
* @generated * @generated
*/ */
@Override @Override
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException { DateRecognizer newElement = CrosswalkFactory.eINSTANCE.createDateRecognizer();
DateRecognizer newElement = CrosswalkFactory.eINSTANCE
.createDateRecognizer();


MappingContainer owner = (MappingContainer) getElementToEdit(); MappingContainer owner = (MappingContainer) getElementToEdit();
owner.getWidgets().add(newElement); owner.getWidgets().add(newElement);
Expand All @@ -88,18 +84,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(DateRecognizer newElement, protected void doConfigure(DateRecognizer newElement, IProgressMonitor monitor, IAdaptable info)
IProgressMonitor monitor, IAdaptable info)
throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down
24 changes: 8 additions & 16 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/DelimitedFileCreateCommand.java
View file
Expand Up @@ -36,8 +36,7 @@ public DelimitedFileCreateCommand(CreateElementRequest req) {
* @generated * @generated
*/ */
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -59,10 +58,8 @@ public boolean canExecute() {
/** /**
* @generated * @generated
*/ */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException { DelimitedFile newElement = CrosswalkFactory.eINSTANCE.createDelimitedFile();
DelimitedFile newElement = CrosswalkFactory.eINSTANCE
.createDelimitedFile();


CrossWalk owner = (CrossWalk) getElementToEdit(); CrossWalk owner = (CrossWalk) getElementToEdit();
owner.setDataSource(newElement); owner.setDataSource(newElement);
Expand All @@ -76,18 +73,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(DelimitedFile newElement, protected void doConfigure(DelimitedFile newElement, IProgressMonitor monitor, IAdaptable info)
IProgressMonitor monitor, IAdaptable info)
throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down
22 changes: 8 additions & 14 deletions crosswalk-gmf.diagram/src/crosswalk/diagram/edit/commands/DictionaryCreateCommand.java
View file
Expand Up @@ -33,8 +33,7 @@ public DictionaryCreateCommand(CreateElementRequest req) {
* @generated * @generated
*/ */
protected EObject getElementToEdit() { protected EObject getElementToEdit() {
EObject container = ((CreateElementRequest) getRequest()) EObject container = ((CreateElementRequest) getRequest()).getContainer();
.getContainer();
if (container instanceof View) { if (container instanceof View) {
container = ((View) container).getElement(); container = ((View) container).getElement();
} }
Expand All @@ -56,8 +55,7 @@ public boolean canExecute() {
/** /**
* @generated * @generated
*/ */
protected CommandResult doExecuteWithResult(IProgressMonitor monitor, protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
IAdaptable info) throws ExecutionException {
Dictionary newElement = CrosswalkFactory.eINSTANCE.createDictionary(); Dictionary newElement = CrosswalkFactory.eINSTANCE.createDictionary();


EditingContainer owner = (EditingContainer) getElementToEdit(); EditingContainer owner = (EditingContainer) getElementToEdit();
Expand All @@ -72,17 +70,13 @@ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
/** /**
* @generated * @generated
*/ */
protected void doConfigure(Dictionary newElement, IProgressMonitor monitor, protected void doConfigure(Dictionary newElement, IProgressMonitor monitor, IAdaptable info)
IAdaptable info) throws ExecutionException { throws ExecutionException {
IElementType elementType = ((CreateElementRequest) getRequest()) IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
.getElementType(); ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
ConfigureRequest configureRequest = new ConfigureRequest( configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
getEditingDomain(), newElement, elementType);
configureRequest.setClientContext(((CreateElementRequest) getRequest())
.getClientContext());
configureRequest.addParameters(getRequest().getParameters()); configureRequest.addParameters(getRequest().getParameters());
ICommand configureCommand = elementType ICommand configureCommand = elementType.getEditCommand(configureRequest);
.getEditCommand(configureRequest);
if (configureCommand != null && configureCommand.canExecute()) { if (configureCommand != null && configureCommand.canExecute()) {
configureCommand.execute(monitor, info); configureCommand.execute(monitor, info);
} }
Expand Down

0 comments on commit fa165a9

Please sign in to comment.