catch up with developmentHEADmaster

Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/org.eclipse.osbp.xtext.blip.ui/META-INF/MANIFEST.MF b/org.eclipse.osbp.xtext.blip.ui/META-INF/MANIFEST.MF
index 3dcb44b..431d821 100644
--- a/org.eclipse.osbp.xtext.blip.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.xtext.blip.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.xtext.ui;bundle-version="[2.11.0,2.12.0)",
  org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.12.0)",
  org.eclipse.xtext.xbase.ui;bundle-version="[2.11.0,2.12.0)",
- org.eclipse.osbp.fork.mihalis.opal.imageSelector.osgi;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.xtext.basic.ui;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.dsl.dto.xtext;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.dsl.entity.xtext;bundle-version="[0.9.0,0.10.0)",
@@ -32,7 +31,8 @@ Require-Bundle: org.apache.log4j;bundle-version="1.2.15",
  org.eclipse.osbp.xtext.blip;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.osbp.xtext.blip.ide;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.xtend.lib;resolution:=optional,
- org.eclipse.bpmn2
+ org.eclipse.bpmn2,
+ org.mihalis.opal;bundle-version="1.0.3"
 Import-Package: javax.validation,
  javax.validation.constraints,
  org.apache.log4j,
diff --git a/org.eclipse.osbp.xtext.blip.ui/src/org/eclipse/osbp/xtext/blip/ui/contentassist/BlipDSLProposalProvider.xtend b/org.eclipse.osbp.xtext.blip.ui/src/org/eclipse/osbp/xtext/blip/ui/contentassist/BlipDSLProposalProvider.xtend
index 8c343bd..7cd8834 100644
--- a/org.eclipse.osbp.xtext.blip.ui/src/org/eclipse/osbp/xtext/blip/ui/contentassist/BlipDSLProposalProvider.xtend
+++ b/org.eclipse.osbp.xtext.blip.ui/src/org/eclipse/osbp/xtext/blip/ui/contentassist/BlipDSLProposalProvider.xtend
@@ -22,7 +22,6 @@ package org.eclipse.osbp.xtext.blip.ui.contentassist
 import com.google.inject.Inject
 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.blip.BlipItem
 import org.eclipse.osbp.xtext.blip.common.BlipHelper
@@ -36,6 +35,7 @@ import org.eclipse.xtext.ui.editor.contentassist.ConfigurableCompletionProposal
 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 ImageFileNameTextApplier extends ReplacementTextApplier {
 	var ContentAssistContext context
diff --git a/org.eclipse.osbp.xtext.blip.ui/xtend-gen/org/eclipse/osbp/xtext/blip/ui/contentassist/ImageFileNameTextApplier.java b/org.eclipse.osbp.xtext.blip.ui/xtend-gen/org/eclipse/osbp/xtext/blip/ui/contentassist/ImageFileNameTextApplier.java
index cfd22db..b1ce369 100644
--- a/org.eclipse.osbp.xtext.blip.ui/xtend-gen/org/eclipse/osbp/xtext/blip/ui/contentassist/ImageFileNameTextApplier.java
+++ b/org.eclipse.osbp.xtext.blip.ui/xtend-gen/org/eclipse/osbp/xtext/blip/ui/contentassist/ImageFileNameTextApplier.java
@@ -16,13 +16,13 @@
  */
 package org.eclipse.osbp.xtext.blip.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 ImageFileNameTextApplier extends ReplacementTextApplier {