Cleaned up:

-Empty but required folders now are being tracked via .gitkeep files
-Cleaned build.properties files
-Moved test source build output folders to bin/test
-Removed duplicate ClickableSubmodelComponentsTest
-Removed source folders from .classpath in projects that don't need /
have source folders

diff --git a/net.mograsim.logic.core/.classpath b/net.mograsim.logic.core/.classpath
index 6096178..cfd1c21 100644 (file)
--- a/net.mograsim.logic.core/.classpath
+++ b/net.mograsim.logic.core/.classpath
@@ -7,8 +7,8 @@
                </attributes>\r
        </classpathentry>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" output="testBin" path="test">\r
+       <classpathentry kind="src" output="bin/src" path="src"/>\r
+       <classpathentry kind="src" output="bin/test" path="test">\r
                <attributes>\r
                        <attribute name="test" value="true"/>\r
                </attributes>\r

diff --git a/net.mograsim.logic.core/.gitignore b/net.mograsim.logic.core/.gitignore
index 43d94ef..265a1ae 100644 (file)
--- a/net.mograsim.logic.core/.gitignore
+++ b/net.mograsim.logic.core/.gitignore
@@ -1,6 +1,4 @@
 /bin/
-/testBin/
-*.class
 *.log
 
 # package files

diff --git a/net.mograsim.logic.core/build.properties b/net.mograsim.logic.core/build.properties
index 33e29ae..d6642e6 100644 (file)
--- a/net.mograsim.logic.core/build.properties
+++ b/net.mograsim.logic.core/build.properties
@@ -1,4 +1,4 @@
 source.. = src/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/

diff --git a/net.mograsim.logic.ui.am2900/.classpath b/net.mograsim.logic.ui.am2900/.classpath
index 6096178..cfd1c21 100644 (file)
--- a/net.mograsim.logic.ui.am2900/.classpath
+++ b/net.mograsim.logic.ui.am2900/.classpath
@@ -7,8 +7,8 @@
                </attributes>\r
        </classpathentry>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry kind="src" output="testBin" path="test">\r
+       <classpathentry kind="src" output="bin/src" path="src"/>\r
+       <classpathentry kind="src" output="bin/test" path="test">\r
                <attributes>\r
                        <attribute name="test" value="true"/>\r
                </attributes>\r

diff --git a/net.mograsim.logic.ui.am2900/META-INF/MANIFEST.MF b/net.mograsim.logic.ui.am2900/META-INF/MANIFEST.MF
index 4faa556..8cd5a45 100644 (file)
--- a/net.mograsim.logic.ui.am2900/META-INF/MANIFEST.MF
+++ b/net.mograsim.logic.ui.am2900/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: net.mograsim.logic.ui.am2900;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Export-Package: net.mograsim.logic.ui.examples,
+ net.mograsim.logic.ui.model.components.mi.nandbased,
  net.mograsim.logic.ui.model.components.mi.nandbased.am2901
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: net.mograsim.logic.ui;bundle-version="0.1.0";visibility:=reexport

diff --git a/net.mograsim.logic.ui.am2900/build.properties b/net.mograsim.logic.ui.am2900/build.properties
index 99caae6..d6642e6 100644 (file)
--- a/net.mograsim.logic.ui.am2900/build.properties
+++ b/net.mograsim.logic.ui.am2900/build.properties
@@ -1,4 +1,4 @@
 source.. = src/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/ClickableSubmodelComponentsTest.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/ClickableSubmodelComponentsTest.java
deleted file mode 100644 (file)
index cd45ee6..0000000
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/ClickableSubmodelComponentsTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package net.mograsim.logic.ui.examples;
-
-import net.mograsim.logic.ui.SimpleLogicUIStandalone;
-import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.GUIBitDisplay;
-import net.mograsim.logic.ui.model.components.GUIManualSwitch;
-import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
-
-public class ClickableSubmodelComponentsTest
-{
-       public static void main(String[] args)
-       {
-               SimpleLogicUIStandalone.executeVisualisation(ClickableSubmodelComponentsTest::createExample);
-       }
-
-       public static void createExample(ViewModelModifiable model)
-       {
-               SimpleRectangularSubmodelComponent comp = new SimpleRectangularSubmodelComponent(model, 1, "")
-               {
-                       {
-                               setSubmodelScale(.4);
-                               setOutputPins("O0");
-
-                               GUIManualSwitch sw = new GUIManualSwitch(submodelModifiable);
-                               GUIBitDisplay bd = new GUIBitDisplay(submodelModifiable);
-
-                               sw.moveTo(10, 5);
-                               bd.moveTo(50, 5);
-
-                       }
-               };
-               comp.moveTo(10, 10);
-       }
-}
\ No newline at end of file

diff --git a/net.mograsim.logic.ui.am2900/testBin/.gitignore b/net.mograsim.logic.ui.am2900/testBin/.gitignore
deleted file mode 100644 (file)
index d64c606..0000000
--- a/net.mograsim.logic.ui.am2900/testBin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/net/

diff --git a/net.mograsim.logic.ui/build.properties b/net.mograsim.logic.ui/build.properties
index 99caae6..d6642e6 100644 (file)
--- a/net.mograsim.logic.ui/build.properties
+++ b/net.mograsim.logic.ui/build.properties
@@ -1,4 +1,4 @@
 source.. = src/
 bin.includes = META-INF/,\
                .,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/

diff --git a/net.mograsim.plugin.branding/.classpath b/net.mograsim.plugin.branding/.classpath
index ca3785c..dd93d7d 100644 (file)
--- a/net.mograsim.plugin.branding/.classpath
+++ b/net.mograsim.plugin.branding/.classpath
@@ -2,6 +2,5 @@
 <classpath>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/net.mograsim.plugin.branding/.gitignore b/net.mograsim.plugin.branding/.gitignore
new file mode 100644 (file)
index 0000000..ae3c172
--- /dev/null
+++ b/net.mograsim.plugin.branding/.gitignore
@@ -0,0 +1 @@
+/bin/

diff --git a/net.mograsim.plugin.branding/build.properties b/net.mograsim.plugin.branding/build.properties
index 4e1b18b..d3232cd 100644 (file)
--- a/net.mograsim.plugin.branding/build.properties
+++ b/net.mograsim.plugin.branding/build.properties
@@ -1,5 +1,3 @@
-source.. = src/\r
-output.. = bin/\r
 bin.includes = META-INF/,\\r
                .,\\r
                eclipse_with_icon_32.png,\\r

diff --git a/net.mograsim.plugin.branding/icons/.gitkeep b/net.mograsim.plugin.branding/icons/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/net.mograsim.plugin.core.nl_de/.classpath b/net.mograsim.plugin.core.nl_de/.classpath
index ca3785c..dd93d7d 100644 (file)
--- a/net.mograsim.plugin.core.nl_de/.classpath
+++ b/net.mograsim.plugin.core.nl_de/.classpath
@@ -2,6 +2,5 @@
 <classpath>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/net.mograsim.plugin.core.nl_de/build.properties b/net.mograsim.plugin.core.nl_de/build.properties
index 41eb6ad..e71aa03 100644 (file)
--- a/net.mograsim.plugin.core.nl_de/build.properties
+++ b/net.mograsim.plugin.core.nl_de/build.properties
@@ -1,4 +1,3 @@
-source.. = src/\r
-output.. = bin/\r
 bin.includes = META-INF/,\\r
-               .\r
+               .,\\r
+               OSGI-INF/\r

diff --git a/net.mograsim.plugin.docs/.classpath b/net.mograsim.plugin.docs/.classpath
index ca3785c..dd93d7d 100644 (file)
--- a/net.mograsim.plugin.docs/.classpath
+++ b/net.mograsim.plugin.docs/.classpath
@@ -2,6 +2,5 @@
 <classpath>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src"/>\r
        <classpathentry kind="output" path="bin"/>\r
 </classpath>\r

diff --git a/net.mograsim.plugin.docs/.gitignore b/net.mograsim.plugin.docs/.gitignore
index cb42e2e..04b0082 100644 (file)
--- a/net.mograsim.plugin.docs/.gitignore
+++ b/net.mograsim.plugin.docs/.gitignore
@@ -1,2 +1,3 @@
 /bin/
-/html/
+/html/*
+!/html/.gitkeep
\ No newline at end of file

diff --git a/net.mograsim.plugin.docs/build.properties b/net.mograsim.plugin.docs/build.properties
index baf92ee..8b2e440 100644 (file)
--- a/net.mograsim.plugin.docs/build.properties
+++ b/net.mograsim.plugin.docs/build.properties
@@ -1,5 +1,3 @@
-source.. = src/\r
-output.. = bin/\r
 bin.includes = plugin.xml,\\r
                META-INF/,\\r
                .,\\r

diff --git a/net.mograsim.plugin.docs/html/.gitkeep b/net.mograsim.plugin.docs/html/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29