Move ui dependency from core to ide

Change-Id: Id9969527a4b43d86cfc3722a79080abba2cd039c
Signed-off-by: Daniel Haftstein <haftsteind@gmail.com>

bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF

diff --git a/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF
index 727db09..882642b 100644
--- a/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.epp.logging.aeri.core/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
  org.eclipse.e4.core.services,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.di,
- org.eclipse.jface,
  org.eclipse.jdt.annotation;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
  org.eclipse.emf.ecore
 Import-Package: com.google.common.annotations;version="[15.0.0,16.0.0)",

bundles/org.eclipse.epp.logging.aeri.core/models/aeri.ecore

diff --git a/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.ecore b/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.ecore
index 73a24e5..46c3c6d 100644
--- a/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.ecore
+++ b/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.ecore
@@ -123,9 +123,6 @@
   <eClassifiers xsi:type="ecore:EDataType" name="IServerConnection" instanceClassName="org.eclipse.epp.logging.aeri.core.IServerConnection"/>
   <eClassifiers xsi:type="ecore:EDataType" name="IReportProcessor" instanceClassName="org.eclipse.epp.logging.aeri.core.IReportProcessor"/>
   <eClassifiers xsi:type="ecore:EDataType" name="IStatus" instanceClassName="org.eclipse.core.runtime.IStatus"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Dialog" instanceClassName="org.eclipse.jface.dialogs.Dialog"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Image" instanceClassName="org.eclipse.swt.graphics.Image"/>
   <eClassifiers xsi:type="ecore:EDataType" name="IConfigurationElement" instanceClassName="org.eclipse.core.runtime.IConfigurationElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="StringToLinkMap" instanceClassName="java.util.Map$Entry">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

bundles/org.eclipse.epp.logging.aeri.core/models/aeri.genmodel

diff --git a/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.genmodel b/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.genmodel
index b31e9f4..48b61d2 100644
--- a/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.genmodel
+++ b/bundles/org.eclipse.epp.logging.aeri.core/models/aeri.genmodel
@@ -44,8 +44,6 @@
     <genDataTypes ecoreDataType="aeri.ecore#//IServerConnection"/>
     <genDataTypes ecoreDataType="aeri.ecore#//IReportProcessor"/>
     <genDataTypes ecoreDataType="aeri.ecore#//IStatus"/>
-    <genDataTypes ecoreDataType="aeri.ecore#//Dialog"/>
-    <genDataTypes ecoreDataType="aeri.ecore#//Image"/>
     <genDataTypes ecoreDataType="aeri.ecore#//IConfigurationElement"/>
     <genClasses ecoreClass="aeri.ecore#//Report">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute aeri.ecore#//Report/anonymousId"/>

bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.ecore

diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.ecore b/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.ecore
index 46cf60c..ea2a276 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.ecore
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.ecore
@@ -34,8 +34,8 @@
         eType="#//LogEvent"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ServerDescriptor" eSuperTypes="../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//Linkable ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//UserSettings">
-    <eOperations name="getImage16" eType="ecore:EDataType ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//Image"/>
-    <eOperations name="getImage32" eType="ecore:EDataType ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//Image"/>
+    <eOperations name="getImage16" eType="#//Image"/>
+    <eOperations name="getImage32" eType="#//Image"/>
     <eOperations name="isActive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -51,7 +51,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="configurationElement" eType="ecore:EDataType ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//IConfigurationElement"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ProcessorDescriptor">
-    <eOperations name="getImage16" eType="ecore:EDataType ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//Image"/>
+    <eOperations name="getImage16" eType="#//Image"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="processor" eType="ecore:EDataType ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//IReportProcessor"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="configurationElement" eType="ecore:EDataType ../../org.eclipse.epp.logging.aeri.core/models/aeri.ecore#//IConfigurationElement"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -61,4 +61,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="automatic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="Image" instanceClassName="org.eclipse.swt.graphics.Image"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="Dialog" instanceClassName="org.eclipse.jface.dialogs.Dialog"/>
 </ecore:EPackage>

bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.genmodel

diff --git a/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.genmodel b/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.genmodel
index 06eff61..1b128c2 100644
--- a/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.genmodel
+++ b/bundles/org.eclipse.epp.logging.aeri.ide/models/aeri.ide.genmodel
@@ -10,6 +10,8 @@
   <foreignModel>aeri.ide.ecore</foreignModel>
   <genPackages prefix="Ide" basePackage="org.eclipse.epp.internal.logging.aeri" disposableProviderFactory="true"
       ecorePackage="aeri.ide.ecore#/">
+    <genDataTypes ecoreDataType="aeri.ide.ecore#//Image"/>
+    <genDataTypes ecoreDataType="aeri.ide.ecore#//Dialog"/>
     <genClasses ecoreClass="aeri.ide.ecore#//LogEventsQueue">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference aeri.ide.ecore#//LogEventsQueue/groups"/>
       <genOperations ecoreOperation="aeri.ide.ecore#//LogEventsQueue/addGroup">