Downgraded LogicUI to Java 8; converted era.mi and LogicUI to plugins

diff --git a/LogicUI/.classpath b/LogicUI/.classpath
index 56baf23..c34bb53 100644 (file)
--- a/LogicUI/.classpath
+++ b/LogicUI/.classpath
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                <attributes>
                        <attribute name="module" value="true"/>
                </attributes>
        </classpathentry>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/SWTZoomableCanvas"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/SWT"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/era.mi"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/LogicUI/.project b/LogicUI/.project
index 8b40ae1..cc7eae3 100644 (file)
--- a/LogicUI/.project
+++ b/LogicUI/.project
@@ -3,6 +3,8 @@
        <name>LogicUI</name>
        <comment></comment>
        <projects>
+               <project>era.mi</project>
+               <project>SWTZoomableCanvas</project>
        </projects>
        <buildSpec>
                <buildCommand>
@@ -10,8 +12,19 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/LogicUI/.settings/org.eclipse.jdt.core.prefs b/LogicUI/.settings/org.eclipse.jdt.core.prefs
index 36338ef..e51d980 100644 (file)
--- a/LogicUI/.settings/org.eclipse.jdt.core.prefs
+++ b/LogicUI/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/LogicUI/META-INF/MANIFEST.MF b/LogicUI/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..2659736
--- /dev/null
+++ b/LogicUI/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: LogicUI
+Bundle-SymbolicName: LogicUI;singleton:=true
+Bundle-Version: 1.0.0
+Export-Package: era.mi.gui,
+ era.mi.gui.components,
+ era.mi.gui.examples,
+ era.mi.gui.wires
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.swt;bundle-version="3.110.0",
+ SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport,
+ era.mi;bundle-version="1.0.0";visibility:=reexport
+Automatic-Module-Name: LogicUI

diff --git a/LogicUI/build.properties b/LogicUI/build.properties
new file mode 100644 (file)
index 0000000..b107977
--- /dev/null
+++ b/LogicUI/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .

diff --git a/SWTHelper b/SWTHelper
index 395b1f9..6f9a55d 160000 (submodule)
--- a/SWTHelper
+++ b/SWTHelper
@@ -1 +1 @@
-Subproject commit 395b1f9321655b638eca4a6715925e7d35e225a3
+Subproject commit 6f9a55d483020bad4a5f66de375c3d0d6da585df

diff --git a/SampleERCP/.project b/SampleERCP/.project
index 12602ef..dd05f6c 100644 (file)
--- a/SampleERCP/.project
+++ b/SampleERCP/.project
@@ -3,6 +3,7 @@
        <name>SampleERCP</name>
        <comment></comment>
        <projects>
+               <project>LogicUI</project>
        </projects>
        <buildSpec>
                <buildCommand>

diff --git a/SampleERCP/META-INF/MANIFEST.MF b/SampleERCP/META-INF/MANIFEST.MF
index d371012..c0a156b 100644 (file)
--- a/SampleERCP/META-INF/MANIFEST.MF
+++ b/SampleERCP/META-INF/MANIFEST.MF
@@ -11,7 +11,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.15.200",
  org.eclipse.e4.core.di;bundle-version="1.7.100",
  org.eclipse.e4.ui.di;bundle-version="1.2.500",
  org.eclipse.ui.workbench;bundle-version="3.113.0",
- javax.annotation;bundle-version="1.2.0"
+ javax.annotation;bundle-version="1.2.0",
+ LogicUI,
+ era.mi
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: Sample
 Export-Package: sampleercp.handlers;uses:="org.eclipse.swt.widgets,org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.workbench.modeling",

diff --git a/SampleERCP/SampleERCP.product b/SampleERCP/SampleERCP.product
index fe801d1..5d61b95 100644 (file)
--- a/SampleERCP/SampleERCP.product
+++ b/SampleERCP/SampleERCP.product
@@ -32,7 +32,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
@@ -59,8 +58,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
    </license>
 
    <plugins>
+      <plugin id="LogicUI"/>
+      <plugin id="SWTBufferedCanvas"/>
+      <plugin id="SWTObjectWrappers"/>
+      <plugin id="SWTZoomableCanvas"/>
       <plugin id="SampleERCP"/>
       <plugin id="com.ibm.icu"/>
+      <plugin id="era.mi"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.servlet"/>

diff --git a/SampleERCP/build.properties b/SampleERCP/build.properties
index e0ed3cc..d1ae984 100644 (file)
--- a/SampleERCP/build.properties
+++ b/SampleERCP/build.properties
@@ -10,3 +10,9 @@ bin.includes = plugin.xml,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/
 source.. = src/
+src.includes = Application.e4xmi,\
+               OSGI-INF/l10n/bundle.properties,\
+               css/,\
+               icons/,\
+               schema/,\
+               splash.bmp

diff --git a/era.mi/.classpath b/era.mi/.classpath
index be85523..dd2ee31 100644 (file)
--- a/era.mi/.classpath
+++ b/era.mi/.classpath
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src" />
-       <classpathentry kind="con"
-               path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5" />
-       <classpathentry kind="con"
-               path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
                <attributes>
-                       <attribute name="module" value="true" />
+                       <attribute name="module" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="output" path="bin" />
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/era.mi/.project b/era.mi/.project
index 9a89f37..3b59be0 100644 (file)
--- a/era.mi/.project
+++ b/era.mi/.project
@@ -10,8 +10,19 @@
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>

diff --git a/era.mi/META-INF/MANIFEST.MF b/era.mi/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..47ff164
--- /dev/null
+++ b/era.mi/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: MI
+Bundle-SymbolicName: era.mi
+Bundle-Version: 1.0.0.qualifier
+Export-Package: era.mi.logic,
+ era.mi.logic.components,
+ era.mi.logic.components.gates,
+ era.mi.logic.tests,
+ era.mi.logic.timeline,
+ era.mi.logic.types,
+ era.mi.logic.wires
+Bundle-RequiredExecutionEnvironment: JavaSE-10
+Automatic-Module-Name: era.mi

diff --git a/era.mi/build.properties b/era.mi/build.properties
new file mode 100644 (file)
index 0000000..b107977
--- /dev/null
+++ b/era.mi/build.properties
@@ -0,0 +1,3 @@
+source.. = src/
+bin.includes = META-INF/,\
+               .