From 3ea332b5b5b47565ab9b197f71741946946205d3 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 24 Jun 2019 00:35:16 +0200 Subject: [PATCH] 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 --- net.mograsim.logic.core/.classpath | 4 +-- net.mograsim.logic.core/.gitignore | 2 -- net.mograsim.logic.core/build.properties | 2 +- net.mograsim.logic.ui.am2900/.classpath | 4 +-- .../META-INF/MANIFEST.MF | 1 + net.mograsim.logic.ui.am2900/build.properties | 2 +- .../ClickableSubmodelComponentsTest.java | 34 ------------------- .../testBin/.gitignore | 1 - net.mograsim.logic.ui/build.properties | 2 +- net.mograsim.plugin.branding/.classpath | 1 - net.mograsim.plugin.branding/.gitignore | 1 + net.mograsim.plugin.branding/build.properties | 2 -- net.mograsim.plugin.branding/icons/.gitkeep | 0 net.mograsim.plugin.core.nl_de/.classpath | 1 - .../build.properties | 5 ++- net.mograsim.plugin.docs/.classpath | 1 - net.mograsim.plugin.docs/.gitignore | 3 +- net.mograsim.plugin.docs/build.properties | 2 -- net.mograsim.plugin.docs/html/.gitkeep | 0 19 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/examples/ClickableSubmodelComponentsTest.java delete mode 100644 net.mograsim.logic.ui.am2900/testBin/.gitignore create mode 100644 net.mograsim.plugin.branding/.gitignore create mode 100644 net.mograsim.plugin.branding/icons/.gitkeep create mode 100644 net.mograsim.plugin.docs/html/.gitkeep diff --git a/net.mograsim.logic.core/.classpath b/net.mograsim.logic.core/.classpath index 191b4f0c..da70a87e 100644 --- a/net.mograsim.logic.core/.classpath +++ b/net.mograsim.logic.core/.classpath @@ -7,8 +7,8 @@ - - + + diff --git a/net.mograsim.logic.core/.gitignore b/net.mograsim.logic.core/.gitignore index 43d94ef6..265a1ae2 100644 --- 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 33e29aed..d6642e65 100644 --- 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 191b4f0c..da70a87e 100644 --- a/net.mograsim.logic.ui.am2900/.classpath +++ b/net.mograsim.logic.ui.am2900/.classpath @@ -7,8 +7,8 @@ - - + + diff --git a/net.mograsim.logic.ui.am2900/META-INF/MANIFEST.MF b/net.mograsim.logic.ui.am2900/META-INF/MANIFEST.MF index 4faa556c..8cd5a458 100644 --- 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 99caae61..d6642e65 100644 --- 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 index cd45ee62..00000000 --- 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 index d64c6065..00000000 --- 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 99caae61..d6642e65 100644 --- 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 e801ebfb..bc3587db 100644 --- a/net.mograsim.plugin.branding/.classpath +++ b/net.mograsim.plugin.branding/.classpath @@ -2,6 +2,5 @@ - diff --git a/net.mograsim.plugin.branding/.gitignore b/net.mograsim.plugin.branding/.gitignore new file mode 100644 index 00000000..ae3c1726 --- /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 bfb1e2c5..aee22c03 100644 --- a/net.mograsim.plugin.branding/build.properties +++ b/net.mograsim.plugin.branding/build.properties @@ -1,5 +1,3 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ .,\ eclipse_with_icon_32.png,\ diff --git a/net.mograsim.plugin.branding/icons/.gitkeep b/net.mograsim.plugin.branding/icons/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/net.mograsim.plugin.core.nl_de/.classpath b/net.mograsim.plugin.core.nl_de/.classpath index e801ebfb..bc3587db 100644 --- a/net.mograsim.plugin.core.nl_de/.classpath +++ b/net.mograsim.plugin.core.nl_de/.classpath @@ -2,6 +2,5 @@ - diff --git a/net.mograsim.plugin.core.nl_de/build.properties b/net.mograsim.plugin.core.nl_de/build.properties index 34d2e4d2..34520a00 100644 --- a/net.mograsim.plugin.core.nl_de/build.properties +++ b/net.mograsim.plugin.core.nl_de/build.properties @@ -1,4 +1,3 @@ -source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + OSGI-INF/ diff --git a/net.mograsim.plugin.docs/.classpath b/net.mograsim.plugin.docs/.classpath index e801ebfb..bc3587db 100644 --- a/net.mograsim.plugin.docs/.classpath +++ b/net.mograsim.plugin.docs/.classpath @@ -2,6 +2,5 @@ - diff --git a/net.mograsim.plugin.docs/.gitignore b/net.mograsim.plugin.docs/.gitignore index cb42e2e7..04b0082b 100644 --- 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 fc53675d..0b7cb312 100644 --- a/net.mograsim.plugin.docs/build.properties +++ b/net.mograsim.plugin.docs/build.properties @@ -1,5 +1,3 @@ -source.. = src/ -output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ diff --git a/net.mograsim.plugin.docs/html/.gitkeep b/net.mograsim.plugin.docs/html/.gitkeep new file mode 100644 index 00000000..e69de29b -- 2.17.1