From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Wed, 14 Sep 2011 10:50:25 +0000 (+0000)
Subject: Fixed errors after moving selection view stuff to org.simantics.selectionview
X-Git-Tag: simantics-1.5~39
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=f5f969a54b55bff09226f0b18b411441dbd0bc19;p=simantics%2Fsysdyn.git

Fixed errors after moving selection view stuff to org.simantics.selectionview

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@22220 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
index d9707f0d..9363e36e 100644
--- a/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
+++ b/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF
@@ -42,7 +42,8 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2",
  org.simantics.structural.ui;bundle-version="1.1.1",
  org.simantics.browsing.ui.model;bundle-version="1.0.0",
  org.simantics.spreadsheet.ui;bundle-version="1.1.0",
- org.simantics.views.swt;bundle-version="1.0.0"
+ org.simantics.views.swt;bundle-version="1.0.0",
+ org.simantics.selectionview;bundle-version="1.0.0"
 Bundle-Activator: org.simantics.sysdyn.ui.Activator
 Bundle-ActivationPolicy: lazy
 Export-Package: org.simantics.sysdyn.ui.browser.nodes
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java
index 30ea93d5..d838c192 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynBrowser.java
@@ -25,12 +25,12 @@ import org.simantics.browsing.ui.swt.ContextMenuInitializer;
 import org.simantics.browsing.ui.swt.DefaultSelectionDataResolver;
 import org.simantics.browsing.ui.swt.GraphExplorerFactory;
 import org.simantics.browsing.ui.swt.IContextMenuInitializer;
-import org.simantics.browsing.ui.swt.IPropertyPage;
 import org.simantics.db.layer0.SelectionHints;
 import org.simantics.db.layer0.variable.Variable;
 import org.simantics.sysdyn.ui.Activator;
 import org.simantics.sysdyn.ui.browser.nodes.VariableNode;
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;
+import org.simantics.ui.workbench.IPropertyPage;
 import org.simantics.utils.datastructures.BinaryFunction;
 import org.simantics.utils.datastructures.hints.IHintContext;
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java
index 4b8357e3..d1b32713 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/browser/SysdynModelBrowser.java
@@ -5,9 +5,9 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.simantics.browsing.ui.swt.IPropertyPage;
 import org.simantics.structural.ui.modelBrowser.ModelBrowser;
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;
+import org.simantics.ui.workbench.IPropertyPage;
 
 public class SysdynModelBrowser extends ModelBrowser {
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java
index dad12ba0..90d35510 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java
@@ -21,7 +21,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.simantics.browsing.ui.swt.AdaptableHintContext;
-import org.simantics.browsing.ui.swt.IPropertyPage;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
@@ -63,6 +62,7 @@ import org.simantics.sysdyn.ui.elements2.SysdynElementFactory;
 import org.simantics.sysdyn.ui.elements2.connections.ConnectionClasses;
 import org.simantics.sysdyn.ui.elements2.connections.SysdynConnectionClass;
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;
+import org.simantics.ui.workbench.IPropertyPage;
 import org.simantics.utils.datastructures.hints.HintContext;
 import org.simantics.utils.datastructures.hints.IHintContext;
 import org.simantics.utils.threads.AWTThread;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java
index b13a6fa2..ad0a573f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/LabelPropertyTabContributor.java
@@ -16,7 +16,6 @@ import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
-import org.simantics.browsing.ui.swt.PropertyTabContributorImpl;
 import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.ReadGraph;
@@ -27,6 +26,7 @@ import org.simantics.db.procedure.AsyncListener;
 import org.simantics.db.request.Read;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
+import org.simantics.selectionview.PropertyTabContributorImpl;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.ui.utils.AdaptionUtils;
 import org.simantics.utils.datastructures.Callback;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
index cf417b6f..79af5b12 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ResourceSelectionProcessor.java
@@ -17,8 +17,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.jface.viewers.ISelection;
-import org.simantics.browsing.ui.SelectionProcessor;
-import org.simantics.browsing.ui.swt.ComparableTabContributor;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.utils.OrderedSetUtils;
@@ -28,6 +26,8 @@ import org.simantics.db.exception.ServiceException;
 import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.layer0.Layer0;
 import org.simantics.modeling.ModelingResources;
+import org.simantics.selectionview.ComparableTabContributor;
+import org.simantics.selectionview.SelectionProcessor;
 import org.simantics.simulation.ontology.SimulationResource;
 import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.browser.nodes.SharedFunctionsFolder;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SysdynPropertyPage.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SysdynPropertyPage.java
index 24d84a81..59e61e5f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SysdynPropertyPage.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/SysdynPropertyPage.java
@@ -14,7 +14,7 @@ package org.simantics.sysdyn.ui.properties;
 import java.util.Set;
 
 import org.eclipse.ui.IWorkbenchPartSite;
-import org.simantics.views.swt.StandardPropertyPage;
+import org.simantics.selectionview.StandardPropertyPage;
 
 public class SysdynPropertyPage extends StandardPropertyPage {