skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Migrating to JDK 1.8

Browse Source
This commit is contained in:
Maarten Billemont
2018-05-15 17:12:42 -04:00
parent bda1ac3bd4
commit 8bdf1755b7
13 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPConstant.java → core/java/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java
View File

@@ -16,7 +16,7 @@
// LICENSE file. Alternatively, see <http://www.gnu.org/licenses/>.
//==============================================================================
package com.lyndir.masterpassword;
package com.lyndir.masterpassword.model;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;

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

@@ -22,6 +22,7 @@ import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;
import static com.lyndir.lhunath.opal.system.util.StringUtils.*;
import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.model.MPConstant;
import javax.annotation.Nonnull;
import org.joda.time.Instant;

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

@@ -25,6 +25,7 @@ import com.lyndir.lhunath.opal.system.CodeUtils;
import com.lyndir.lhunath.opal.system.logging.Logger;
import com.lyndir.lhunath.opal.system.util.ConversionUtils;
import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.model.MPConstant;
import com.lyndir.masterpassword.model.MPIncorrectMasterPasswordException;
import java.io.*;
import java.util.regex.Matcher;

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

@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.*;
import com.google.common.primitives.UnsignedInteger;
import com.lyndir.lhunath.opal.system.CodeUtils;
import com.lyndir.masterpassword.*;
import com.lyndir.masterpassword.model.MPConstant;
import com.lyndir.masterpassword.model.MPIncorrectMasterPasswordException;
import java.util.*;
import javax.annotation.Nullable;

2
core/java/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java
View File

@@ -87,7 +87,7 @@ public class MPTestSuite implements Callable<Boolean> {
if ("case".equals( qName ))
tests.cases.add( currentCase );
if ("algorithm".equals( qName ))
currentCase.algorithm = ConversionUtils.toInteger( text ).orNull();
currentCase.algorithm = ConversionUtils.toInteger( text ).orElse( null );
if ("fullName".equals( qName ))
currentCase.fullName = text;
if ("masterPassword".equals( qName ))