Skip to content

Refactor/new object diagram fixes #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmedkha79 wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Refactor/new object diagram fixes #125

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6a3db30
Large Scale Change: Unused Imports removed
Jan 28, 2026
be73a68
refactor(gui/objectdiagram): modernize NewObjectDiagram for readabili…
Feb 1, 2026
4b1e06c
refactor(gui): NewObjectDiagram — fix Map access, null-safety and min…
Feb 2, 2026
d91a6d5
refactor(gui): NewObjectDiagram — small cleanups: replace double-brac…
Feb 11, 2026
260a560
refactor(gui): NewObjectDiagram — mark immutable fields and inner act…
Feb 11, 2026
b91a5a2
fix(gui): AssociationOrLinkPartEdge — use getter for visibleData obje…
Feb 11, 2026
1f25629
refactor(gui): NewObjectDiagram — safety and modernization: safe map …
Feb 11, 2026
a841dbd
refactor(gui): NewObjectDiagram — cleanups & warnings fixes Änderunge…
Feb 12, 2026
6b351e8
refactor(gui): NewObjectDiagram — cleanups & warnings fixes Änderunge…
Feb 12, 2026
47c13f7
Merge remote-tracking branch 'origin/refactor/NewObjectDiagram-fixes'…
Feb 14, 2026
574d8e6
Merge branch 'useocl:master' into refactor/NewObjectDiagram-fixes
ahmedkha79 Feb 15, 2026
82ca193
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
62e2e26
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
fbcd4fe
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
4dd78ce
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
921182e
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
1a699c9
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
84e59c0
Harden getLinkByValue in NewObjectDiagram: null-safety, List.equals, …
Feb 18, 2026
4b6617c
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
662eaa3
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
212e224
Update use-gui/src/main/java/module-info.java
ahmedkha79 Feb 18, 2026
e509b8f
Update use-gui/src/main/java/org/tzi/use/gui/views/diagrams/objectdia…
ahmedkha79 Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions use-gui/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@
exports org.tzi.use.gui.views.diagrams.behavior.shared to com.google.common;
exports org.tzi.use.gui.views.selection to com.google.common;
exports org.tzi.use.gui.views.diagrams.statemachine to com.google.common;
exports org.tzi.use.gui.views.diagrams.elements;
exports org.tzi.use.gui.views.diagrams.elements.edges;
exports org.tzi.use.gui.views.diagrams.event;
exports org.tzi.use.gui.views.selection.objectselection;
Comment thread
ahmedkha79 marked this conversation as resolved.
Outdated
}
10 changes: 4 additions & 6 deletions ...rc/main/java/org/tzi/use/gui/views/diagrams/elements/edges/AssociationOrLinkPartEdge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ public boolean adjacentObjectNodeGreyed() {

List<MObject> adjacentObjects = getLink().linkedObjects();
for (MObject adjacentObject : adjacentObjects) {
ObjectNode node = visibleData.fObjectToNodeMap.get(adjacentObject);
if(node.isGreyed()) {
ObjectNode node = visibleData.getObjectToNodeMap().get(adjacentObject);
if (node != null && node.isGreyed()) {
return true;
}
}
Expand Down Expand Up @@ -365,8 +365,7 @@ public void drawProperties(Graphics2D g) {
public static AssociationOrLinkPartEdge create(PlaceableNode source,
PlaceableNode target, MAssociationEnd targetEnd, DiagramView diagram,
MAssociation assoc, MLink link) {
AssociationOrLinkPartEdge edge = new AssociationOrLinkPartEdge(source, target, targetEnd, diagram, assoc, link);
return edge;
return new AssociationOrLinkPartEdge(source, target, targetEnd, diagram, assoc, link);
}

/**
Expand All @@ -375,8 +374,7 @@ public static AssociationOrLinkPartEdge create(PlaceableNode source,
public static AssociationOrLinkPartEdge create(PlaceableNode source,
PlaceableNode target, String name, MAssociationEnd targetEnd,
DiagramView diagram, MAssociation assoc, MLink link) {
AssociationOrLinkPartEdge edge = new AssociationOrLinkPartEdge(source, target, name, targetEnd, diagram, assoc, link);
return edge;
return new AssociationOrLinkPartEdge(source, target, name, targetEnd, diagram, assoc, link);
}

@Override
Expand Down
Loading
Loading