From f18278f3e62a669ebbba2db6cfcbe1ca5c682dac Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Tue, 25 Jun 2019 14:57:57 +0200
Subject: [PATCH] Included net.mograsim.preferences into
 net.mograsim.plugin.feature

---
 net.mograsim.logic.ui/META-INF/MANIFEST.MF                 | 2 +-
 net.mograsim.plugin.feature/feature.xml                    | 7 +++++++
 net.mograsim.plugin.updatesite/site.xml                    | 2 +-
 net.mograsim.preferences/.classpath                        | 4 ++--
 .../.settings/org.eclipse.jdt.core.prefs                   | 2 ++
 net.mograsim.preferences/META-INF/MANIFEST.MF              | 7 +++----
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/net.mograsim.logic.ui/META-INF/MANIFEST.MF b/net.mograsim.logic.ui/META-INF/MANIFEST.MF
index ea9c1d06..e3487146 100644
--- a/net.mograsim.logic.ui/META-INF/MANIFEST.MF
+++ b/net.mograsim.logic.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Export-Package: net.mograsim.logic.ui,
  net.mograsim.logic.ui.modeladapter.componentadapters,
  net.mograsim.logic.ui.util
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.swt;bundle-version="3.110.0";visibility:=reexport,
+Require-Bundle: org.eclipse.swt;bundle-version="3.0.0";visibility:=reexport,
  SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport,
  net.mograsim.logic.core;bundle-version="0.1.0";visibility:=reexport,
  com.google.gson;bundle-version="2.8.2";visibility:=reexport,
diff --git a/net.mograsim.plugin.feature/feature.xml b/net.mograsim.plugin.feature/feature.xml
index d884c289..f29c03f4 100644
--- a/net.mograsim.plugin.feature/feature.xml
+++ b/net.mograsim.plugin.feature/feature.xml
@@ -754,4 +754,11 @@ exception as provided by Oracle in the LICENSE file that accompanied this code.&
          version="0.1.0.qualifier"
          unpack="false"/>
 
+   <plugin
+         id="net.mograsim.preferences"
+         download-size="1"
+         install-size="1"
+         version="0.1.0.qualifier"
+         unpack="false"/>
+
 </feature>
diff --git a/net.mograsim.plugin.updatesite/site.xml b/net.mograsim.plugin.updatesite/site.xml
index 8e1ba9e7..280a6d15 100644
--- a/net.mograsim.plugin.updatesite/site.xml
+++ b/net.mograsim.plugin.updatesite/site.xml
@@ -3,7 +3,7 @@
    <description name="Mograsim update site">
       Provides updates for the modular graphical simulator (Mograsim)
    </description>
-   <feature url="features/net.mograsim.feature_0.1.0.201906231912.jar" id="net.mograsim.feature" version="0.1.0.201906231912">
+   <feature url="features/net.mograsim.feature_0.1.0.201906251447.jar" id="net.mograsim.feature" version="0.1.0.201906251447">
       <category name="mograsim.basic"/>
    </feature>
    <category-def name="mograsim.basic" label="Mograsim">
diff --git a/net.mograsim.preferences/.classpath b/net.mograsim.preferences/.classpath
index 751c8f2e..e801ebfb 100644
--- a/net.mograsim.preferences/.classpath
+++ b/net.mograsim.preferences/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/net.mograsim.preferences/.settings/org.eclipse.jdt.core.prefs b/net.mograsim.preferences/.settings/org.eclipse.jdt.core.prefs
index f8bd225a..2aece3be 100644
--- a/net.mograsim.preferences/.settings/org.eclipse.jdt.core.prefs
+++ b/net.mograsim.preferences/.settings/org.eclipse.jdt.core.prefs
@@ -26,6 +26,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
@@ -71,6 +72,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=info
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=info
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
diff --git a/net.mograsim.preferences/META-INF/MANIFEST.MF b/net.mograsim.preferences/META-INF/MANIFEST.MF
index 7fb5fc03..315ec1ab 100644
--- a/net.mograsim.preferences/META-INF/MANIFEST.MF
+++ b/net.mograsim.preferences/META-INF/MANIFEST.MF
@@ -1,11 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
+Bundle-Name: Mograsim Preferences
 Bundle-SymbolicName: net.mograsim.preferences
 Bundle-Version: 0.1.0.qualifier
 Export-Package: net.mograsim.preferences
 Bundle-Vendor: Mograsim Team
 Automatic-Module-Name: net.mograsim.preferences
-Import-Package: org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: org.eclipse.swt;bundle-version="3.0.0"
-- 
2.17.1