Skip to content

Bug Fix for text fields #47

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

Merged
bbuttermann merged 1 commit into from
Oct 7, 2024
Merged

Bug Fix for text fields #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 42 additions & 27 deletions src/main/java/com/netspi/awssigner/controller/TextComponentFocusListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import java.awt.event.FocusListener;
import java.util.Optional;
import java.util.function.BiConsumer;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;

class TextComponentFocusListener<T extends Profile> implements FocusListener {
Expand All @@ -24,43 +26,56 @@ public TextComponentFocusListener(AWSSignerController controller, String propert

@Override
public void focusGained(FocusEvent e) {
/*
* Save the current profile being updated.
* This is important because we can't just use the SELECTED profile when
* focus is lost. This fails if focus is lost by selecting a new profile.
* THAT other newly selected profile would be updated instead
*/
currentProfileOptional = controller.getCurrentSelectedProfile();
JTextComponent textComponent = (JTextComponent) e.getComponent();
currentValue = textComponent.getText();

// Add document listener when focus is gained
textComponent.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
textChanged();
}

@Override
public void removeUpdate(DocumentEvent e) {
textChanged();
}

//Also note the value when focus was gained. This helps us detected if the value actually changed or not when focus is lost
currentValue = ((JTextComponent) e.getComponent()).getText();
@Override
public void changedUpdate(DocumentEvent e) {
textChanged();
}

private void textChanged() {
String currentText = textComponent.getText();
if (!currentValue.equals(currentText)) {
currentValue = currentText;
updateProfile(currentText);
}
}
});

logDebug("Profile " + propertyLoggingName + " Text Field focus gained." + " Cause: " + e.getCause() + " ID:" + e.getID() + " Current value: " + ((JTextComponent) e.getComponent()).getText());
logDebug("Profile " + propertyLoggingName + " Text Field focus gained." + " Cause: " + e.getCause() + " ID:" + e.getID() + " Current value: " + currentValue);
}

@Override
public void focusLost(FocusEvent e) {
logDebug("Profile " + propertyLoggingName + " Text Field focus lost." + " Cause: " + e.getCause() + " ID:" + e.getID());
String currentText = ((JTextComponent) e.getComponent()).getText();
if (currentValue.equals(currentText)) {
logDebug("Current value has not changed. Not firing update with current value: " + currentValue);
} else {
currentValue = currentText;

//The value has changed. Let's check if we have a profile we're intending to update.
if (currentProfileOptional.isPresent()) {
Profile currentProfile = currentProfileOptional.get();
logInfo("Profile " + currentProfile.getName() + " " + propertyLoggingName + " text changed. New Value: " + currentText);
if (currentText == null || currentText.isBlank()) {
updateFunction.accept((T) currentProfile, null);
} else {
updateFunction.accept((T) currentProfile, currentText);
}
controller.updateProfileStatus();
} else {
logDebug("Profile " + propertyLoggingName + " focus lost, but no profile selected. Ignoring.");
}
if (!currentValue.equals(currentText)) {
updateProfile(currentText);
}
}

private void updateProfile(String currentText) {
if (currentProfileOptional.isPresent()) {
Profile currentProfile = currentProfileOptional.get();
logInfo("Profile " + currentProfile.getName() + " " + propertyLoggingName + " text changed. New Value: " + currentText);
updateFunction.accept((T) currentProfile, currentText);
controller.updateProfileStatus();
} else {
logDebug("Profile " + propertyLoggingName + " focus lost, but no profile selected. Ignoring.");
}
}
}