1. 17 Mar, 2020 3 commits
  2. 16 Mar, 2020 1 commit
  3. 15 Mar, 2020 1 commit
  4. 14 Mar, 2020 1 commit
  5. 03 Mar, 2020 1 commit
  6. 17 Feb, 2020 1 commit
  7. 13 Jan, 2020 1 commit
  8. 09 Dec, 2019 2 commits
  9. 14 Nov, 2019 1 commit
  10. 15 Oct, 2019 1 commit
  11. 09 Oct, 2019 2 commits
  12. 03 Sep, 2019 1 commit
  13. 27 Aug, 2019 1 commit
  14. 01 Aug, 2019 1 commit
  15. 03 May, 2019 1 commit
  16. 14 Mar, 2019 1 commit
  17. 03 Mar, 2019 1 commit
  18. 15 Feb, 2019 1 commit
  19. 31 Jan, 2019 1 commit
  20. 23 Jan, 2019 1 commit
  21. 29 Nov, 2018 2 commits
    • Ludwig Dickmanns's avatar
      Merge branch 'master' into 3476-Testcase_Generation_reformatting · c923d97f
      Ludwig Dickmanns authored
      # Conflicts:
      #	org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/AllocationTableEditor.java
      #	org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/ParameterEntryTreeViewerEditingSupport.java
      #	org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/ParameterTableTreeViewerManager.java
      #	org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/TreeViewerCheckBoxEditingSupport.java
      #	org.fortiss.af3.allocation.ui/src/org/fortiss/af3/allocation/ui/editor/treeviewer/TreeViewerManager.java
      #	org.fortiss.af3.allocation/src/org/fortiss/af3/allocation/IAllocationService.java
      #	org.fortiss.af3.allocation/src/org/fortiss/af3/allocation/internal/AllocationService.java
      #	org.fortiss.af3.allocation/src/org/fortiss/af3/allocation/utils/AllocationUtils.java
      #	org.fortiss.af3.component.ui/src/org/fortiss/af3/component/ui/generator/FMUGeneratorExecutionTarget.java
      #	org.fortiss.af3.component.ui/src/org/fortiss/af3/component/ui/properties/ComponentSpecificationPropertySection.java
      #	org.fortiss.af3.component.ui/src/org/fortiss/af3/component/ui/properties/PortInitValueSection.java
      #	org.fortiss.af3.component/model/component.genmodel
      #	org.fortiss.af3.component/src/org/fortiss/af3/component/generator/fmu/ComponentArchitectureToFMUArchivePackageTransformation.java
      #	org.fortiss.af3.component/src/org/fortiss/af3/component/listener/CodeSpecRenamingPersistencyListener.java
      #	org.fortiss.af3.component/src/org/fortiss/af3/component/utils/ComponentUtils.java
      #	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/editor/ExternalSpecificationEditor.java
      #	org.fortiss.af3.cosimulation.ui/src/org/fortiss/af3/cosimulation/ui/simulator/FMUSimulatorExecutionTarget.java
      #	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/ConstraintToNonQuantifiedSMT.java
      #	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/ConstraintToQuantifiedSMT.java
      #	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/DSMLTransformationService.java
      #	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/DeploymentRun.java
      #	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/ScheduleRun.java
      #	org.fortiss.af3.exploration.smt/src/org/fortiss/af3/exploration/smt/modeltransformation/SolverRun.java
      #	org.fortiss.af3.exploration.smt/test-src/org/fortiss/af3/exploration/ui/featuretest/CreateTestFiles.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/AllocationPatternCompositeBackend.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/constraint/FunctionCouplingCompositeBackend.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/dashboard/projectwizard/DashboardWizardSelectProjectSource.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/generic/SynthesisViewBase.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/service/DSEPerspectiveManager.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/DeploymentSynthesisViewBackend.java
      #	org.fortiss.af3.exploration.ui/src/org/fortiss/af3/exploration/ui/perspective/synthesis/ScheduleSynthesisViewBackend.java
      #	org.fortiss.af3.exploration/model/dsl_v2.genmodel
      #	org.fortiss.af3.exploration/model/exploration.genmodel
      #	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/lang/ExplorationExpressionDeploymentValidator.java
      #	org.fortiss.af3.exploration/src/org/fortiss/af3/exploration/service/internal/DSEBackendService.java
      #	org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/properties/EnumPropertySection.java
      #	org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/properties/EnumerationMemberPropertySection.java
      #	org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/properties/StructureMemberPropertySection.java
      #	org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/properties/StructurePropertySection.java
      #	org.fortiss.af3.generator.common/src/org/fortiss/af3/generator/common/textgen/c/templates/TemplateLoader.java
      #	org.fortiss.af3.generator.common/src/org/fortiss/af3/generator/common/utils/SourceUtils.java
      #	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/contextElement/WordElementEditingSupport.java
      #	org.fortiss.af3.mode.ui/src/org/fortiss/af3/mode/ui/properties/ModeComponentStructPropertySection.java
      #	org.fortiss.af3.msc.ui/src/org/fortiss/af3/msc/ui/properties/MSCTimeSpecificationPropertySection.java
      #	org.fortiss.af3.operatorpanel.ui/src/org/fortiss/af3/operatorpanel/ui/properties/DataBindingUtil.java
      #	org.fortiss.af3.operatorpanel.ui/src/org/fortiss/af3/operatorpanel/ui/properties/InputOPItemPropertySection.java
      #	org.fortiss.af3.operatorpanel.ui/src/org/fortiss/af3/operatorpanel/ui/properties/OP2DGraphDisplayPropertySection.java
      #	org.fortiss.af3.operatorpanel.ui/src/org/fortiss/af3/operatorpanel/ui/properties/OPToggleButtonPropertySection.java
      #	org.fortiss.af3.partition.ui/src/org/fortiss/af3/partition/ui/editor/InputPortToPartitionInputPortAllocationTableEditor.java
      #	org.fortiss.af3.partition.ui/src/org/fortiss/af3/partition/ui/editor/OutputPortToPartitionOutputPortAllocationTableEditor.java
      #	org.fortiss.af3.platform.beagle.ui/src/org/fortiss/af3/platform/beagle/ui/properties/BeagleBoneExecutionUnitPropertySection.java
      #	org.fortiss.af3.platform.beagle.ui/src/org/fortiss/af3/platform/beagle/ui/properties/SimplAsciiDevicePropertySection.java
      #	org.fortiss.af3.platform.beagle.ui/src/org/fortiss/af3/platform/beagle/ui/properties/UDPMasterSlaveMultiCastNetworkPropertySection.java
      #	org.fortiss.af3.platform.beagle.ui/src/org/fortiss/af3/platform/beagle/ui/properties/UDPMasterSlaveTransceiverPropertySection.java
      #	org.fortiss.af3.platform.beagle.ui/src/org/fortiss/af3/platform/beagle/ui/properties/VirtualKeyBoardInputPropertySection.java
      #	org.fortiss.af3.platform.ui/src/org/fortiss/af3/platform/ui/editor/ComponentToExecutionUnitTableEditor.java
      #	org.fortiss.af3.refinement.ui/src/org/fortiss/af3/refinement/ui/editor/RefinementSpecificationEditor.java
      #	org.fortiss.af3.safetycases.ui/src/org/fortiss/af3/safetycases/ui/properties/ConnectionPropertySection.java
      #	org.fortiss.af3.specification/src/org/fortiss/af3/specification/modelchecking/af3tonusmv/AF3ToNuSMVTransformation.java
      #	org.fortiss.af3.state.ui/src/org/fortiss/af3/state/ui/properties/StateAutomatonPropertySection.java
      #	org.fortiss.af3.state.ui/src/org/fortiss/af3/state/ui/properties/StateSpecificationPropertySection.java
      #	org.fortiss.af3.state.ui/src/org/fortiss/af3/state/ui/properties/TransitionSegmentSpecificationPropertySection.java
      #	org.fortiss.af3.task.ui/src/org/fortiss/af3/task/ui/editor/InputPortToTaskInputPortAllocationTableEditor.java
      #	org.fortiss.af3.task.ui/src/org/fortiss/af3/task/ui/editor/OutputPortToTaskOutputPortAllocationTableEditor.java
      #	org.fortiss.af3.task.ui/src/org/fortiss/af3/task/ui/editor/TaskArchitectureTimingEditor.java
      #	org.fortiss.af3.task/src/org/fortiss/af3/task/AF3TaskActivator.java
      #	org.fortiss.af3.testing/META-INF/MANIFEST.MF
      #	org.fortiss.af3.testing/src/org/fortiss/af3/testing/utils/.ratings
      Signed-off-by: Ludwig Dickmanns's avatarLudwig Dickmanns <dickmanns@fortiss.org>
      c923d97f
    • Ludwig Dickmanns's avatar
      ec45c170
  22. 20 Nov, 2018 1 commit
  23. 14 Nov, 2018 2 commits
  24. 13 Nov, 2018 1 commit
  25. 08 Nov, 2018 1 commit
  26. 06 Nov, 2018 1 commit
  27. 29 Oct, 2018 1 commit
  28. 10 Oct, 2018 1 commit
  29. 02 Oct, 2018 1 commit
  30. 01 Oct, 2018 3 commits
  31. 24 Sep, 2018 1 commit
  32. 18 Sep, 2018 1 commit