catch up with development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.xtext.perspective.ui/META-INF/MANIFEST.MF b/org.eclipse.osbp.xtext.perspective.ui/META-INF/MANIFEST.MF
index 81d4781..88e7de3 100644
--- a/org.eclipse.osbp.xtext.perspective.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.xtext.perspective.ui/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@
org.eclipse.jdt.debug.ui,
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.11.0,2.12.0)",
org.eclipse.compare,
- org.eclipse.osbp.fork.mihalis.opal.imageSelector.osgi;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.xtext.perspective;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.xtext.perspective.ide;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.preferences;bundle-version="[0.9.0,0.10.0)",
@@ -31,7 +30,8 @@
org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
org.eclipse.osbp.xtext.oxtype;bundle-version="[0.9.0,0.10.0)",
org.eclipse.osbp.xtext.oxtype.ui;bundle-version="[0.9.0,0.10.0)",
- org.eclipse.xtend.lib;resolution:=optional
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.mihalis.opal;bundle-version="1.0.3"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.osbp.xtext.perspective.ui;version="0.9.0",
org.eclipse.osbp.xtext.perspective.ui.contentassist;version="0.9.0",
diff --git a/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend b/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend
index 4c4932a..d853b40 100644
--- a/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend
+++ b/org.eclipse.osbp.xtext.perspective.ui/src/org/eclipse/osbp/xtext/perspective/ui/contentassist/PerspectiveDslProposalProvider.xtend
@@ -24,7 +24,6 @@
import org.eclipse.bpmn2.impl.UserTaskImpl
import org.eclipse.emf.ecore.EObject
import org.eclipse.jface.viewers.StyledString
-import org.eclipse.osbp.fork.mihalis.opal.widgets.ImageSelectorDialog
import org.eclipse.osbp.xtext.basic.ui.contentassist.BasicDSLProposalProviderHelper
import org.eclipse.osbp.xtext.perspective.PerspectivePart
import org.eclipse.osbp.xtext.perspective.PerspectivePartStack
@@ -39,6 +38,7 @@
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext
import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor
import org.eclipse.xtext.ui.editor.contentassist.ReplacementTextApplier
+import org.mihalis.opal.imageSelector.ImageSelectorDialog
class IconNameTextApplier extends ReplacementTextApplier {
var ContentAssistContext context
diff --git a/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/IconNameTextApplier.java b/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/IconNameTextApplier.java
index 95f65a8..9d71707 100644
--- a/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/IconNameTextApplier.java
+++ b/org.eclipse.osbp.xtext.perspective.ui/xtend-gen/org/eclipse/osbp/xtext/perspective/ui/contentassist/IconNameTextApplier.java
@@ -16,13 +16,13 @@
*/
package org.eclipse.osbp.xtext.perspective.ui.contentassist;
-import org.eclipse.osbp.fork.mihalis.opal.widgets.ImageSelectorDialog;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal;
import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext;
import org.eclipse.xtext.ui.editor.contentassist.ReplacementTextApplier;
+import org.mihalis.opal.imageSelector.ImageSelectorDialog;
@SuppressWarnings("all")
public class IconNameTextApplier extends ReplacementTextApplier {
diff --git a/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java b/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java
index b42f151..644b0de 100644
--- a/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java
+++ b/org.eclipse.osbp.xtext.perspective/emf-gen/org/eclipse/osbp/xtext/perspective/PerspectiveDslPackage.java
@@ -203,7 +203,7 @@
* @generated
* @ordered
*/
- int PERSPECTIVE_PACKAGE___ERESOLVE_PROXY__OBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
+ int PERSPECTIVE_PACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT = OSBPTypesPackage.LPACKAGE___ERESOLVE_PROXY__INTERNALEOBJECT;
/**
* The number of operations of the '<em>Perspective Package</em>' class.
