package org.simantics.plant3d.dialog;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.LocalResourceManager;
-import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ListViewer;
import org.eclipse.swt.widgets.ExpandItem;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
+import org.simantics.Simantics;
+import org.simantics.db.Session;
import org.simantics.db.exception.DatabaseException;
import org.simantics.plant3d.ontology.Plant3D;
import org.simantics.plant3d.scenegraph.Equipment;
-import org.simantics.plant3d.scenegraph.InlineComponent;
import org.simantics.plant3d.scenegraph.Nozzle;
import org.simantics.plant3d.scenegraph.P3DRootNode;
-import org.simantics.plant3d.scenegraph.PipelineComponent;
-import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.PositionType;
import org.simantics.plant3d.utils.Item;
import org.simantics.plant3d.utils.P3DUtil;
import org.simantics.utils.ui.ExceptionUtils;
public class EquipmentSelectionDialog extends Dialog implements ISelectionChangedListener{
- private ResourceManager resourceManager;
private String libUri;
- private P3DRootNode root;
private Item selected;
private Item selectedNozzle;
public EquipmentSelectionDialog(Shell parentShell, P3DRootNode root, String libUri){
super(parentShell);
- this.root = root;
this.libUri = libUri;
}
- protected List<Item> getItems(Class c, String libUri) throws DatabaseException{
+ protected List<Item> getItems(Class<?> c, String libUri) throws DatabaseException{
+ Session session = Simantics.getSession();
if (Equipment.class.equals(c)) {
- return P3DUtil.getEquipments(libUri);
+ return P3DUtil.getEquipments(session, libUri);
} else if (Nozzle.class.equals(c)) {
- return P3DUtil.getNozzles(libUri);
+ return P3DUtil.getNozzles(session, libUri);
}
return null;
}
@Override
protected Control createDialogArea(Composite parent) {
- resourceManager = new LocalResourceManager(JFaceResources.getResources(), parent);
-
Composite composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2,false);
layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);