From 87b7afd58702c2c8438f0e8259bfdeaf50d9c119 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 16 May 2018 19:22:19 -0400 Subject: [PATCH] Reformat. --- .../com/lyndir/masterpassword/MPAlgorithm.java | 5 +---- .../masterpassword/model/MPUserManager.java | 7 ++++--- .../model/impl/MPFlatUnmarshaller.java | 1 - .../gui/model/MPIncognitoQuestion.java | 2 +- .../masterpassword/gui/view/PasswordFrame.java | 3 ++- .../masterpassword/gui/view/UnlockFrame.java | 16 ++++++++-------- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java index 05eaf9dc..07e2a714 100644 --- a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java +++ b/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java @@ -23,10 +23,7 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.google.common.primitives.UnsignedInteger; import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests; import com.lyndir.lhunath.opal.system.MessageDigests; -import com.lyndir.masterpassword.impl.MPAlgorithmV0; -import com.lyndir.masterpassword.impl.MPAlgorithmV1; -import com.lyndir.masterpassword.impl.MPAlgorithmV2; -import com.lyndir.masterpassword.impl.MPAlgorithmV3; +import com.lyndir.masterpassword.impl.*; import java.nio.ByteOrder; import java.nio.charset.Charset; import javax.annotation.Nullable; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java index 5a790b10..1ab18f54 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java @@ -18,9 +18,10 @@ package com.lyndir.masterpassword.model; -import com.google.common.collect.*; -import java.util.*; -import java.util.stream.Collectors; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; +import java.util.Collection; +import java.util.Map; /** diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java index 0d513be6..d1f0f381 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java @@ -32,7 +32,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.joda.time.DateTime; import org.joda.time.Instant; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java index a01921dc..63b8e3d9 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java @@ -18,7 +18,7 @@ package com.lyndir.masterpassword.gui.model; -import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse; +import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*; import com.lyndir.masterpassword.MPResultType; import com.lyndir.masterpassword.model.impl.MPBasicQuestion; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java index cd36c5b4..4bae7167 100755 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java @@ -30,7 +30,8 @@ import com.lyndir.masterpassword.gui.util.Components; import com.lyndir.masterpassword.gui.util.UnsignedIntegerModel; import com.lyndir.masterpassword.model.MPSite; import com.lyndir.masterpassword.model.MPUser; -import com.lyndir.masterpassword.model.impl.*; +import com.lyndir.masterpassword.model.impl.MPFileSite; +import com.lyndir.masterpassword.model.impl.MPFileUser; import java.awt.*; import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.Transferable; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java index f5a80aef..670ef3cc 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java @@ -39,14 +39,14 @@ import javax.swing.*; @SuppressWarnings({ "MagicNumber", "serial" }) public class UnlockFrame extends JFrame { - private final SignInCallback signInCallback; - private final Components.GradientPanel root; - private final JLabel identiconLabel; - private final JButton signInButton; - private final JPanel authenticationContainer; - private AuthenticationPanel authenticationPanel; - private Future identiconFuture; - private boolean incognito; + private final SignInCallback signInCallback; + private final Components.GradientPanel root; + private final JLabel identiconLabel; + private final JButton signInButton; + private final JPanel authenticationContainer; + private AuthenticationPanel authenticationPanel; + private Future identiconFuture; + private boolean incognito; @Nullable private MPUser> user;