Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

TTool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c9b96ac9

Commit c9b96ac9 authored 11 months ago by Alan Birchler De Allende

Downloads
- Plain Diff

Merge branch 'master' into 'alan_attack_tree_gen'

# Conflicts:
#   src/main/java/ui/atd/ATDAttack.java
#   src/main/java/ui/atd/AttackTreeDiagramPanel.java

parents efa94d92 b0fec70a

No related branches found

No related tags found

Loading

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

build.txt 1 addition, 1 deletion

build.txt
src/main/java/attacktrees/Attack.java 9 additions, 0 deletions

src/main/java/attacktrees/Attack.java
src/main/java/attacktrees/AttackNode.java 3 additions, 0 deletions

src/main/java/attacktrees/AttackNode.java
src/main/java/ui/atd/ATDAttack.java 4 additions, 1 deletion

src/main/java/ui/atd/ATDAttack.java
src/main/java/ui/atd/ATDConstraint.java 12 additions, 0 deletions

src/main/java/ui/atd/ATDConstraint.java
src/main/java/ui/atd/AttackTreeDiagramPanel.java 4 additions, 12 deletions

src/main/java/ui/atd/AttackTreeDiagramPanel.java
src/main/java/ui/util/DefaultText.java 2 additions, 2 deletions

src/main/java/ui/util/DefaultText.java
src/main/java/ui/window/JFrameAI.java 1 addition, 0 deletions

src/main/java/ui/window/JFrameAI.java

with 36 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment