skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Reformat.

Browse Source
This commit is contained in:
Maarten Billemont 2018-05-16 19:22:19 -04:00
parent 2db0bb35d5
commit 87b7afd587
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java
View File

@ -23,10 +23,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.primitives.UnsignedInteger; import com.google.common.primitives.UnsignedInteger;
import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests; import com.lyndir.lhunath.opal.system.MessageAuthenticationDigests;
import com.lyndir.lhunath.opal.system.MessageDigests; import com.lyndir.lhunath.opal.system.MessageDigests;
import com.lyndir.masterpassword.impl.MPAlgorithmV0; import com.lyndir.masterpassword.impl.*;
import com.lyndir.masterpassword.impl.MPAlgorithmV1;
import com.lyndir.masterpassword.impl.MPAlgorithmV2;
import com.lyndir.masterpassword.impl.MPAlgorithmV3;
import java.nio.ByteOrder; import java.nio.ByteOrder;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import javax.annotation.Nullable; import javax.annotation.Nullable;

7
core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java
View File

@ -18,9 +18,10 @@
package com.lyndir.masterpassword.model; package com.lyndir.masterpassword.model;
import com.google.common.collect.*; import com.google.common.collect.ImmutableList;
import java.util.*; import com.google.common.collect.Maps;
import java.util.stream.Collectors; import java.util.Collection;
import java.util.Map;
/** /**

1
core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java
View File

@ -32,7 +32,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.joda.time.DateTime;
import org.joda.time.Instant; import org.joda.time.Instant;

2
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java
View File

@ -18,7 +18,7 @@
package com.lyndir.masterpassword.gui.model; 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.MPResultType;
import com.lyndir.masterpassword.model.impl.MPBasicQuestion; import com.lyndir.masterpassword.model.impl.MPBasicQuestion;

3
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java
View File

@ -30,7 +30,8 @@ import com.lyndir.masterpassword.gui.util.Components;
import com.lyndir.masterpassword.gui.util.UnsignedIntegerModel; import com.lyndir.masterpassword.gui.util.UnsignedIntegerModel;
import com.lyndir.masterpassword.model.MPSite; import com.lyndir.masterpassword.model.MPSite;
import com.lyndir.masterpassword.model.MPUser; 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.*;
import java.awt.datatransfer.StringSelection; import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable; import java.awt.datatransfer.Transferable;

16
platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java
View File

@ -39,14 +39,14 @@ import javax.swing.*;
@SuppressWarnings({ "MagicNumber", "serial" }) @SuppressWarnings({ "MagicNumber", "serial" })
public class UnlockFrame extends JFrame { public class UnlockFrame extends JFrame {
private final SignInCallback signInCallback; private final SignInCallback signInCallback;
private final Components.GradientPanel root; private final Components.GradientPanel root;
private final JLabel identiconLabel; private final JLabel identiconLabel;
private final JButton signInButton; private final JButton signInButton;
private final JPanel authenticationContainer; private final JPanel authenticationContainer;
private AuthenticationPanel<?> authenticationPanel; private AuthenticationPanel<?> authenticationPanel;
private Future<?> identiconFuture; private Future<?> identiconFuture;
private boolean incognito; private boolean incognito;
@Nullable @Nullable
private MPUser<? extends MPSite<?>> user; private MPUser<? extends MPSite<?>> user;