Andreas Mülder 13 лет назад
Родитель
Сommit
fed7fe58b7

+ 0 - 99
plugins/org.yakindu.sct.ui.editor/src/org/yakindu/sct/ui/editor/propertysheets/StatePropertySection.java

@@ -10,40 +10,29 @@
  */
 package org.yakindu.sct.ui.editor.propertysheets;
 
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.databinding.IEMFValueProperty;
 import org.eclipse.emf.databinding.edit.EMFEditProperties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
 import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.xtext.naming.QualifiedName;
 import org.yakindu.base.base.BasePackage;
 import org.yakindu.sct.model.sgraph.SGraphPackage;
 import org.yakindu.sct.model.sgraph.State;
-import org.yakindu.sct.ui.editor.dialogs.SelectSubmachineDialog;
 import org.yakindu.sct.ui.editor.extensions.ExpressionLanguageProviderExtensions.SemanticTarget;
 import org.yakindu.sct.ui.editor.propertysheets.OrderElementControl.ISourceObjectCallback;
 import org.yakindu.sct.ui.editor.utils.HelpContextIds;
@@ -58,12 +47,10 @@ import com.google.inject.Injector;
 public class StatePropertySection extends
 		AbstractTwoColumnEditorPropertySection implements ISourceObjectCallback {
 
-	private Label lblSubmachine;
 	private Control txtSpecification;
 	private Control txtName;
 	private Text txtDoc;
 
-	//private UpdateLabelAdapter updateLabelAdapter = new UpdateLabelAdapter();
 	private OrderElementControl orderElementControl;
 
 	@Override
@@ -81,7 +68,6 @@ public class StatePropertySection extends
 	protected void createRightColumnControls(Composite rightColumn) {
 		createDocumentationControl(rightColumn);
 		createTransitionsControl(rightColumn);
-		//createSubmachineControl(rightColumn);
 	}
 
 	protected void createNameControl(final Composite parent) {
@@ -116,25 +102,6 @@ public class StatePropertySection extends
 				.applyTo(txtSpecification);
 	}
 
-	protected void createSubmachineControl(final Composite parent) {
-		Label label = getToolkit().createLabel(parent, "State Submachine:");
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setBackground(ColorConstants.white);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginLeft = 0;
-		layout.marginRight = 0;
-		composite.setLayout(layout);
-		lblSubmachine = new Label(composite, SWT.BORDER);
-		Button openDialog = new Button(composite, SWT.FLAT);
-		openDialog.setText("...");
-		openDialog.addListener(SWT.Selection, new OpenDialogHandler(parent));
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(composite);
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(lblSubmachine);
-		GridDataFactory.fillDefaults().applyTo(label);
-		GridDataFactory.fillDefaults().hint(SWT.DEFAULT, 10)
-				.applyTo(openDialog);
-	}
-
 	protected void createTransitionsControl(Composite parent) {
 		Label label = getToolkit().createLabel(parent, "Transition Priority:");
 		GridDataFactory.fillDefaults().applyTo(label);
@@ -154,7 +121,6 @@ public class StatePropertySection extends
 		bindSpecificationControl(context);
 		bindDocumentationControl(context);
 		orderElementControl.refreshInput();
-		//updateLabel();
 	}
 
 	protected void bindDocumentationControl(EMFDataBindingContext context) {
@@ -197,74 +163,9 @@ public class StatePropertySection extends
 		context.bindValue(nameTextProperty, nameProperty.observe(eObject));
 	}
 
-	protected void updateLabel() {
-		String substatechartId = getState().getSubstatechartId();
-		if (substatechartId != null) {
-			lblSubmachine.setText(substatechartId);
-		} else {
-			lblSubmachine.setText("");
-		}
-	}
-
-//	@Override
-//	protected void setEObject(EObject object) {
-//		if (getEObject() != null)
-//			getEObject().eAdapters().remove(updateLabelAdapter);
-//		super.setEObject(object);
-//		getEObject().eAdapters().add(updateLabelAdapter);
-//	}
-
-//	@Override
-//	public void dispose() {
-//		if (getEObject() != null) {
-//			getEObject().eAdapters().remove(updateLabelAdapter);
-//		}
-//		super.dispose();
-//	}
-
 	@Override
 	public EObject getEObject() {
 		return super.getEObject();
 	}
 
-	protected final class OpenDialogHandler implements Listener {
-		private final Composite parent;
-
-		private OpenDialogHandler(Composite parent) {
-			this.parent = parent;
-		}
-
-		public void handleEvent(Event event) {
-			SelectSubmachineDialog dialog = new SelectSubmachineDialog(
-					parent.getShell(), eObject.eResource());
-			dialog.setElements(new Object[] { eObject });
-			if (org.eclipse.jface.dialogs.Dialog.OK == dialog.open()) {
-				QualifiedName selectedSubmachine = dialog
-						.getSelectedSubmachine();
-				if (selectedSubmachine != null || dialog.isClearSelected()) {
-					SetValueCommand command = new SetValueCommand(
-							new SetRequest(
-									eObject,
-									SGraphPackage.Literals.STATE__SUBSTATECHART_ID,
-									selectedSubmachine != null ? selectedSubmachine
-											.toString() : null));
-					try {
-						OperationHistoryFactory.getOperationHistory().execute(
-								command, new NullProgressMonitor(), null);
-					} catch (ExecutionException e) {
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-	}
-
-//	protected final class UpdateLabelAdapter extends AdapterImpl {
-//		@Override
-//		public void notifyChanged(Notification msg) {
-//			if (msg.getFeature() == SGraphPackage.Literals.STATE__SUBSTATECHART_ID) {
-//				updateLabel();
-//			}
-//		}
-//	}
 }