Code

#43: implement xml merger#363

Code

Merged

hohwille merged 27 commits intodevonfw:maindevonfw/IDEasy:mainfrom salimbouch:xml-mergerCopy head branch name to clipboardJun 20, 2024

+1,027-76

Commits

Commits on May 16, 2024

• implemented wrappers for elements, enums

  salimbouch

  committed
  5e690c9

  Copy full SHA for 5e690c9

Commits on May 17, 2024

• implemented combine keep override logic, improved mergeElement and Attribute

  salimbouch

  committed
  9805604

  Copy full SHA for 9805604

• refactored the mess, implemented root merging

  salimbouch

  committed
  45cc98d

  Copy full SHA for 45cc98d

Commits on May 18, 2024

• implemented xpath matching

  salimbouch

  committed
  50dae84

  Copy full SHA for 50dae84

Commits on May 22, 2024

• implemented merging logic

  salimbouch

  committed
  9435940

  Copy full SHA for 9435940

Commits on May 23, 2024

• refactored project structure

  salimbouch

  committed
  a297cb7

  Copy full SHA for a297cb7

• solved bugs

  salimbouch

  committed
  5d60820

  Copy full SHA for 5d60820

• adjust exception

  salimbouch

  committed
  6e77202

  Copy full SHA for 6e77202

Commits on May 24, 2024

• redesigned id logic

  salimbouch

  committed
  77dc1b2

  Copy full SHA for 77dc1b2

Commits on May 26, 2024

• Merge branch 'main' of https://github.com/devonfw/IDEasy into xml-merger

  salimbouch

  committed
  1089d75

  Copy full SHA for 1089d75

Commits on May 27, 2024

• refactored to use strategy pattern

  salimbouch

  committed
  956cacd

  Copy full SHA for 956cacd

• implemented unit tests, refactored

  salimbouch

  committed
  8093c1d

  Copy full SHA for 8093c1d

• Merge branch 'main' of https://github.com/devonfw/ideasy into xml-merger

  salimbouch

  committed
  e502734

  Copy full SHA for e502734

• fixed tests

  salimbouch

  committed
  09cd59a

  Copy full SHA for 09cd59a

• improved structure

  salimbouch

  committed
  166fa26

  Copy full SHA for 166fa26

Commits on May 28, 2024

• fixed xml formatting, adjusted tests

  salimbouch

  committed
  6f610ff

  Copy full SHA for 6f610ff

• tiny variables refactoring

  salimbouch

  committed
  79ddfba

  Copy full SHA for 79ddfba

• added comment

  salimbouch

  committed
  0729787

  Copy full SHA for 0729787

Commits on May 29, 2024

• Merge branch 'main' into xml-merger

  salimbouch

  authored
  6bfc4b2

  Copy full SHA for 6bfc4b2

Commits on May 31, 2024

• remove unused imports

  salimbouch

  committed
  cbaabd8

  Copy full SHA for cbaabd8

Commits on Jun 2, 2024

• implemented inverseMerge

  salimbouch

  committed
  0788037

  Copy full SHA for 0788037

• added javadoc to strategy package

  salimbouch

  committed
  456d667

  Copy full SHA for 456d667

Commits on Jun 3, 2024

• added seperate class for id retrieval

  salimbouch

  committed
  39a8d75

  Copy full SHA for 39a8d75

Commits on Jun 9, 2024

• refactored strategy factory

  salimbouch

  committed
  cef5951

  Copy full SHA for cef5951

Commits on Jun 17, 2024

• Merge branch 'main' into xml-merger

  salimbouch

  authored
  e2f5c71

  Copy full SHA for e2f5c71

Commits on Jun 19, 2024

• added new test case

  salimbouch

  committed
  a2190a2

  Copy full SHA for a2190a2

Commits on Jun 20, 2024

• Merge branch 'main' into xml-merger

  hohwille

  authored
  6fc5b3c

  Copy full SHA for 6fc5b3c