/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2017 Association for Decentralized Information Management
* in Industry THTH ry.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
*
* Contributors:
* VTT Technical Research Centre of Finland - initial API and implementation
+ * Semantum Oy - #7586
*******************************************************************************/
package org.simantics.diagram.ui;
@Override
public void addedToContext(ICanvasContext ctx) {
super.addedToContext(ctx);
- if (site != null && site.getSelectionProvider() != this) {
- swt.asyncExec(new Runnable() {
- @Override
- public void run() {
- if (site.getSelectionProvider() != WorkbenchSelectionProvider.this)
- site.setSelectionProvider(WorkbenchSelectionProvider.this);
- }
- });
- }
+ swt.asyncExec(() -> {
+ if (site != null && site.getSelectionProvider() != WorkbenchSelectionProvider.this)
+ site.setSelectionProvider(WorkbenchSelectionProvider.this);
+ });
}
@Override
public void removedFromContext(ICanvasContext ctx) {
- if (site != null && site.getSelectionProvider() == this) {
- swt.asyncExec(new Runnable() {
- @Override
- public void run() {
- if (site.getSelectionProvider() == WorkbenchSelectionProvider.this)
- site.setSelectionProvider(null);
- }
- });
- }
+ swt.asyncExec(() -> {
+ if (site != null && site.getSelectionProvider() == WorkbenchSelectionProvider.this)
+ site.setSelectionProvider(null);
+ });
super.removedFromContext(ctx);
}
-
+
public void fireSelection(Iterable<?> selection) {
final ISelection s = constructAdaptableSelection(selection);
- swt.asyncExec(new Runnable() {
- @Override
- public void run() {
- currentSelection = s;
- fireSelectionChanged(s);
- schedulePostSelectionChanged(s);
- }
+ swt.asyncExec(() -> {
+ currentSelection = s;
+ fireSelectionChanged(s);
+ schedulePostSelectionChanged(s);
});
}
Iterable<?> selection = (Iterable<?>) newValue;
fireSelection(selection);
}
-
+
@HintListener(Class = Selection.class, Field = "SELECTION0")
public void hintRemoved(IHintObservable sender, Key key, Object oldValue) {
//System.out.println("selection removed: " + oldValue);
protected void schedulePostSelectionChanged(final ISelection s) {
final int count = ++modCount;
- ThreadUtils.getNonBlockingWorkExecutor().schedule(new Runnable() {
- @Override
- public void run() {
- int newCount = modCount;
- if (count != newCount)
- return;
- if (isRemoved())
- return;
- swt.asyncExec(new Runnable() {
- @Override
- public void run() {
- if (isRemoved())
- return;
- firePostSelectionChanged(s);
- }
- });
- }
+ ThreadUtils.getNonBlockingWorkExecutor().schedule(() -> {
+ int newCount = modCount;
+ if (count != newCount)
+ return;
+ if (isRemoved())
+ return;
+ swt.asyncExec(() -> {
+ if (!isRemoved())
+ firePostSelectionChanged(s);
+ });
}, POST_SELECTION_DELAY, TimeUnit.MILLISECONDS);
}
+/*******************************************************************************
+ * Copyright (c) 2017 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Semantum Oy - initial API and implementation
+ *******************************************************************************/
package org.simantics.modeling.ui.actions;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.simantics.layer0.Layer0;
import org.simantics.modeling.MigrateModel;
import org.simantics.modeling.ModelingResources;
+import org.simantics.modeling.ui.diagramEditor.DiagramEditor;
import org.simantics.structural.stubs.StructuralResource2;
import org.simantics.ui.utils.ResourceAdaptionUtils;
+import org.simantics.utils.ui.SWTUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * @author Hannu Niemistö
+ * @since 1.31.0
+ */
public class SwitchComponentTypeContribution extends ContributionItem {
private static final Logger LOGGER = LoggerFactory.getLogger(SwitchComponentTypeContribution.class);
Simantics.getSession().asyncRequest(new WriteRequest() {
@Override
public void perform(WriteGraph graph) throws DatabaseException {
- MigrateModel.changeComponentType(graph, elementToComponent(graph, resource), newComponentType);
+ Resource component = elementToComponent(graph, resource);
+ MigrateModel.changeComponentType(graph, component, newComponentType);
+
+ Layer0 L0 = Layer0.getInstance(graph);
+ Resource composite = graph.getPossibleObject(component, L0.PartOf);
+ if (composite == null)
+ return;
+ ModelingResources MOD = ModelingResources.getInstance(graph);
+ Resource diagram = graph.getPossibleObject(composite, MOD.CompositeToDiagram);
+ if (diagram == null)
+ return;
+ SWTUtils.asyncExec(menu, () -> DiagramEditor.reinitializeDiagram(diagram));
}
});
}
/*******************************************************************************
- * Copyright (c) 2012 Association for Decentralized Information Management in
- * Industry THTH ry.
+ * Copyright (c) 2012, 2017 Association for Decentralized Information Management
+ * in Industry THTH ry.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
*
* Contributors:
* VTT Technical Research Centre of Finland - initial API and implementation
+ * Semantum Oy - #7586
*******************************************************************************/
package org.simantics.modeling.ui.diagramEditor;
import java.lang.reflect.Constructor;
+import java.util.function.Predicate;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExecutableExtension;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IPartListener2;
+import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartReference;
+import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.EditorPart;
private static final DisposingPolicy DISPOSING_POLICY =
new DisposingPolicy();
-
- private Runnable disposer = new Runnable() {
- @Override
- public void run() {
- tryDisposeViewer();
- }
- };
+
+ private Runnable disposer = () -> tryDisposeViewer();
private void tryDisposeViewer() {
if (viewer != null) {
}
}
}
-
+
/**
* Initializes the diagram viewer if not already initialized.
*/
// END: IPartListener2 implementation
+ /**
+ * Reinitialize this diagram editor from scratch.
+ *
+ * <p>Must be invoked from the SWT thread.</p>
+ */
+ public void reinitializeViewer() {
+ if (viewer != null) {
+ DISPOSING_POLICY.removeDisposer(disposer);
+ tryDisposeViewer();
+ try {
+ viewer = createViewer();
+ viewer.init(this, getEditorSite(), getEditorInput(), diagramContainer, selectionProvider);
+ initializeViewer();
+ } catch (PartInitException e) {
+ // This should never happen!
+ ErrorLogger.defaultLogError(e);
+ }
+ }
+ }
+
+ /**
+ * Reinitializes all {@link DiagramEditor} instances in all workbench windows for which
+ * the specified predicate returns <code>true</code>.
+ *
+ * <p>Must be invoked from the SWT thread.</p>
+ *
+ * @param predicate
+ * tester for editor inputs
+ */
+ public static void reinitializeDiagram(Predicate<IEditorInput> predicate) {
+ for (IWorkbenchWindow window : PlatformUI.getWorkbench().getWorkbenchWindows()) {
+ for (IWorkbenchPage page : window.getPages()) {
+ for (IEditorReference editorRef : page.getEditorReferences()) {
+ try {
+ IEditorInput input = editorRef.getEditorInput();
+ if (predicate.test(input)) {
+ IEditorPart editor = editorRef.getEditor(false);
+ if (editor instanceof DiagramEditor)
+ ((DiagramEditor) editor).reinitializeViewer();
+ }
+ } catch (PartInitException e) {
+ ErrorLogger.defaultLogError(e);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Reinitializes all DiagramEditor instances in all workbench windows that have
+ * the specified <code>diagram</code> as their input.
+ *
+ * <p>Must be invoked from the SWT thread.</p>
+ *
+ * @param diagram
+ * the diagram resource for which to reinitialize all DiagramEditors
+ * for
+ */
+ public static void reinitializeDiagram(Resource diagram) {
+ reinitializeDiagram(input -> input instanceof IResourceEditorInput
+ && ((IResourceEditorInput) input).getResource().equals(diagram));
+ }
+
}
Code Review / simantics / platform.git / commitdiff