diff options
3 files changed, 10 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/eTrice-rt.launch b/plugins/org.eclipse.etrice.core.room.ui/eTrice-rt.launch index 63704533c..a4adb96c5 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/eTrice-rt.launch +++ b/plugins/org.eclipse.etrice.core.room.ui/eTrice-rt.launch @@ -17,7 +17,7 @@ <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m -XX:MaxPermSize=256m -ea"/> diff --git a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java index e0e83450c..999b607e6 100644 --- a/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java +++ b/plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/FSMSupportUtil.java @@ -858,7 +858,8 @@ public class FSMSupportUtil { continue; double[] relPos = positionProvider.getSubPosition((StateGraphNode) childBo); - gaService.setLocation(child.getGraphicsAlgorithm(), (int)(relPos[0] * ps.getWidth()), (int)(relPos[1]*ps.getHeight())); + if(relPos != null) + gaService.setLocation(child.getGraphicsAlgorithm(), (int)(relPos[0] * ps.getWidth()), (int)(relPos[1]*ps.getHeight())); } } diff --git a/team/flattenProjectsWinV2.bat b/team/flattenProjectsWinV2.bat index 28bbba91f..b42947119 100644 --- a/team/flattenProjectsWinV2.bat +++ b/team/flattenProjectsWinV2.bat @@ -27,6 +27,9 @@ mklink /J %dest%\org.eclipse.etrice.tutorials.java %parent%..\examples\org.eclip mklink /J %dest%\org.eclipse.etrice.examples.c %parent%..\examples\org.eclipse.etrice.examples.c mklink /J %dest%\org.eclipse.etrice.examples.java %parent%..\examples\org.eclipse.etrice.examples.java +mklink /J %dest%\org.eclipse.etrice.generator.c.reference %parent%..\examples\org.eclipse.etrice.generator.c.reference +mklink /J %dest%\org.eclipse.etrice.generator.cpp.reference %parent%..\examples\org.eclipse.etrice.generator.cpp.reference + REM runtime mklink /J %dest%\org.eclipse.etrice.modellib.c %parent%..\runtime\org.eclipse.etrice.modellib.c mklink /J %dest%\org.eclipse.etrice.modellib.java %parent%..\runtime\org.eclipse.etrice.modellib.java @@ -38,4 +41,7 @@ mklink /J %dest%\org.eclipse.etrice.runtime.java %parent%..\runtime\org.eclipse. REM tests mklink /J %dest%\org.eclipse.etrice.generator.common.tests %parent%..\tests\org.eclipse.etrice.generator.common.tests mklink /J %dest%\org.eclipse.etrice.runtime.c.tests %parent%..\tests\org.eclipse.etrice.runtime.c.tests -mklink /J %dest%\org.eclipse.etrice.runtime.cpp.tests %parent%..\tests\org.eclipse.etrice.runtime.cpp.tests
\ No newline at end of file +mklink /J %dest%\org.eclipse.etrice.runtime.cpp.tests %parent%..\tests\org.eclipse.etrice.runtime.cpp.tests + + + |