Merge remote-tracking branch 'origin/development' into development

diff --git a/LogicUI/.classpath b/LogicUI/.classpath
index c34bb53..bde0882 100644 (file)
--- a/LogicUI/.classpath
+++ b/LogicUI/.classpath
@@ -1,6 +1,6 @@
 <?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-1.8">
+       <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"/>
                </attributes>

diff --git a/LogicUI/.settings/org.eclipse.jdt.core.prefs b/LogicUI/.settings/org.eclipse.jdt.core.prefs
index e51d980..36338ef 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=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=10
 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=1.8
+org.eclipse.jdt.core.compiler.source=10
 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
index 2659736..99a8096 100644 (file)
--- a/LogicUI/META-INF/MANIFEST.MF
+++ b/LogicUI/META-INF/MANIFEST.MF
@@ -6,8 +6,12 @@ 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
+ era.mi.gui.model,
+ era.mi.gui.model.components,
+ era.mi.gui.model.wires,
+ era.mi.gui.modeladapter,
+ era.mi.gui.modeladapter.componentadapters
+Bundle-RequiredExecutionEnvironment: JavaSE-10
 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

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index 6610e2e..6355044 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -76,10 +76,11 @@ public class LogicUICanvas extends ZoomableCanvas
 
                addZoomedRenderer(gc ->
                {
+                       gc.setLineWidth(.5);
+                       model.getWires().forEach(w -> w.render(gc));
                        Rectangle visibleRegion = new Rectangle(offX, offY, gW / zoom, gH / zoom);
                        model.getComponents().forEach(c -> drawComponent(gc, c, visibleRegion));
                });
-               addZoomedRenderer(gc -> model.getWires().forEach(w -> w.render(gc)));
                addListener(SWT.MouseDown, this::mouseDown);
        }
 

diff --git a/SWTHelper b/SWTHelper
index 6f9a55d..7d47333 160000 (submodule)
--- a/SWTHelper
+++ b/SWTHelper
@@ -1 +1 @@
-Subproject commit 6f9a55d483020bad4a5f66de375c3d0d6da585df
+Subproject commit 7d47333ed050416991e97421ece07965edb3d7f2