Skip to content

Commit 0229530

Browse files
committed
Fix merge mishap
1 parent fbdd2b3 commit 0229530

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/snapshot/SnapshotController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,6 +1535,7 @@ private int measureStringWidth(String text, Font font) {
15351535
return (int) mText.getLayoutBounds().getWidth();
15361536
}
15371537

1538+
/**
15381539
* @param configurationData {@link ConfigurationData} obejct of a {@link org.phoebus.applications.saveandrestore.model.Configuration}
15391540
* @return <code>true</code> if any if the {@link ConfigPv} items in {@link ConfigurationData#getPvList()} defines a non-null read-back
15401541
* PV name, otherwise <code>false</code>.

0 commit comments

Comments
 (0)