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 d9707f0db72f73a2b29a3161a3aadd8589bf35cf..9363e36ede4fb3c60b92703e2b1705ba634aaad2 100644 (file)
--- 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 30ea93d51cf397d250b1ea60e052f1c48ed11291..d838c1924118a38b108e4cd129f377deb42d72c4 100644 (file)
--- 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;\r
 import org.simantics.browsing.ui.swt.GraphExplorerFactory;\r
 import org.simantics.browsing.ui.swt.IContextMenuInitializer;\r
-import org.simantics.browsing.ui.swt.IPropertyPage;\r
 import org.simantics.db.layer0.SelectionHints;\r
 import org.simantics.db.layer0.variable.Variable;\r
 import org.simantics.sysdyn.ui.Activator;\r
 import org.simantics.sysdyn.ui.browser.nodes.VariableNode;\r
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;\r
+import org.simantics.ui.workbench.IPropertyPage;\r
 import org.simantics.utils.datastructures.BinaryFunction;\r
 import org.simantics.utils.datastructures.hints.IHintContext;\r
 \r

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 4b8357e3b0145251e6b5e1ee4db995065fc375f7..d1b327132b8daa54b7aae5cd32f35d7d9625fe1a 100644 (file)
--- 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;\r
 import java.util.Set;\r
 \r
-import org.simantics.browsing.ui.swt.IPropertyPage;\r
 import org.simantics.structural.ui.modelBrowser.ModelBrowser;\r
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;\r
+import org.simantics.ui.workbench.IPropertyPage;\r
 \r
 public class SysdynModelBrowser extends ModelBrowser {\r
 \r

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 dad12ba0e16fa50e617cf0eb168fa1797a418ea8..90d35510353ce8ac29f42a70e187579a96f4da37 100644 (file)
--- 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;\r
 import org.eclipse.ui.IWorkbenchPartSite;\r
 import org.simantics.browsing.ui.swt.AdaptableHintContext;\r
-import org.simantics.browsing.ui.swt.IPropertyPage;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.Session;\r
@@ -63,6 +62,7 @@ import org.simantics.sysdyn.ui.elements2.SysdynElementFactory;
 import org.simantics.sysdyn.ui.elements2.connections.ConnectionClasses;\r
 import org.simantics.sysdyn.ui.elements2.connections.SysdynConnectionClass;\r
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;\r
+import org.simantics.ui.workbench.IPropertyPage;\r
 import org.simantics.utils.datastructures.hints.HintContext;\r
 import org.simantics.utils.datastructures.hints.IHintContext;\r
 import org.simantics.utils.threads.AWTThread;\r

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 b13a6fa207daa5d06a425e25903fdb95c934caa5..ad0a573f9cbf0457f996ce560a5038d3c29f2e14 100644 (file)
--- 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;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.IWorkbenchSite;\r
-import org.simantics.browsing.ui.swt.PropertyTabContributorImpl;\r
 import org.simantics.browsing.ui.swt.widgets.impl.WidgetSupportImpl;\r
 import org.simantics.db.AsyncReadGraph;\r
 import org.simantics.db.ReadGraph;\r
@@ -27,6 +26,7 @@ import org.simantics.db.procedure.AsyncListener;
 import org.simantics.db.request.Read;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.modeling.ModelingResources;\r
+import org.simantics.selectionview.PropertyTabContributorImpl;\r
 import org.simantics.ui.SimanticsUI;\r
 import org.simantics.ui.utils.AdaptionUtils;\r
 import org.simantics.utils.datastructures.Callback;\r

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 cf417b6f8061ebe5fdab3784c65dcd5158ad1b38..79af5b1264d1927fc4ae53906ee75f297185d68f 100644 (file)
--- 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;\r
 \r
 import org.eclipse.jface.viewers.ISelection;\r
-import org.simantics.browsing.ui.SelectionProcessor;\r
-import org.simantics.browsing.ui.swt.ComparableTabContributor;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.common.utils.OrderedSetUtils;\r
@@ -28,6 +26,8 @@ import org.simantics.db.exception.ServiceException;
 import org.simantics.diagram.stubs.DiagramResource;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.modeling.ModelingResources;\r
+import org.simantics.selectionview.ComparableTabContributor;\r
+import org.simantics.selectionview.SelectionProcessor;\r
 import org.simantics.simulation.ontology.SimulationResource;\r
 import org.simantics.sysdyn.SysdynResource;\r
 import org.simantics.sysdyn.ui.browser.nodes.SharedFunctionsFolder;\r

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 24d84a81df03d2d16475757094b7ed35f6fc3eac..59e61e5f4acb9dc4273dc8eb38e98517a2f2ee22 100644 (file)
--- 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;\r
 \r
 import org.eclipse.ui.IWorkbenchPartSite;\r
-import org.simantics.views.swt.StandardPropertyPage;\r
+import org.simantics.selectionview.StandardPropertyPage;\r
 \r
 public class SysdynPropertyPage extends StandardPropertyPage {\r
 \r