skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Cleanup and fix some warnings.

Browse Source
This commit is contained in:
Maarten Billemont 2018-07-18 15:46:06 -04:00
parent 596ace51ea
commit 3403449ca2
8 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
platform-independent/c/core/build.gradle
View File

@ -14,14 +14,13 @@ artifacts {
from 'lib'
components.withType( ComponentWithRuntimeFile ) {
if (isOptimized()) {
if (optimized)
from runtimeFile, {
into standardOperatingSystem( targetPlatform ) + '/' + standardArchitecture( targetPlatform )
}
}
}
}
}
library {
baseName.set( 'mpw' )
@ -55,31 +54,33 @@ library {
from files( new File( Jvm.current().javaHome, 'include' ) ) { first().eachDir { from it } }
}
binaries.configureEach {
binaries.whenElementFinalized {
project.dependencies {
def system = standardOperatingSystem( targetPlatform )
project.dependencies {
add( linkLibraries.name,
fileTree( "$rootDir/../lib/libsodium/build-${system}~/out/lib" ) )
}
archive.dependsOn project.tasks.maybeCreate( "build_libsodium-${system}", Exec.class ).configure {
// libsodium
archive.dependsOn project.tasks.maybeCreate( "build_libsodium-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-${system}"
privateHeaders.from "$rootDir/../lib/libsodium/build-${system}~/out/include"
add( linkLibraries.name, fileTree( "$rootDir/../lib/libsodium/build-${system}~/out/lib" ) )
}
clean.dependsOn project.tasks.maybeCreate( "clean_libsodium-${system}", Exec.class ).configure {
clean.dependsOn project.tasks.maybeCreate( "clean_libsodium-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/../lib/bin/build_libsodium-${system}", 'clean'
}
archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec.class ).configure {
// libjson-c
archive.dependsOn project.tasks.maybeCreate( "build_libjson-c-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}"
privateHeaders.from "$rootDir/../lib/libjson-c/build-${system}~/out/include"
add( linkLibraries.name, fileTree( "$rootDir/../lib/libjson-c/build-${system}~/out/lib" ) )
}
clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec.class ).configure {
clean.dependsOn project.tasks.maybeCreate( "clean_libjson-c-${system}", Exec ).configure {
commandLine 'bash', "$rootDir/../lib/bin/build_libjson-c-${system}", 'clean'
}
}
}
}
}
static String standardOperatingSystem(NativePlatform platform) {
OperatingSystem os = platform.getOperatingSystem()

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

@ -47,7 +47,7 @@ public class GUI {
public static void main(final String... args) {
Thread.setDefaultUncaughtExceptionHandler(
(t, e) -> logger.err( e, "Uncaught: %s", e.getLocalizedMessage() ) );
(t, e) -> logger.bug( e, "Uncaught: %s", e.getLocalizedMessage() ) );
if (Config.get().checkForUpdates())
checkUpdate();

4
platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/SwingExecutorService.java
View File

@ -33,7 +33,7 @@ public class SwingExecutorService extends AbstractExecutorService {
synchronized (pendingCommands) {
if (pendingCommands.isEmpty())
terminated.offer( true );
terminated.add( true );
}
}
@ -85,7 +85,7 @@ public class SwingExecutorService extends AbstractExecutorService {
pendingCommands.remove( command );
if (shutdown && pendingCommands.isEmpty())
terminated.offer( true );
terminated.add( true );
}
}
}

13
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/Changeable.java
View File

@ -11,11 +11,12 @@ public class Changeable {
private static final ExecutorService changeExecutor = Executors.newSingleThreadExecutor();
private boolean changed;
private final Object mutex = new Object();
private Grouping grouping = Grouping.APPLY;
private boolean changed;
void setChanged() {
synchronized (changeExecutor) {
synchronized (mutex) {
if (changed)
return;
@ -23,6 +24,7 @@ public class Changeable {
changed = true;
if (grouping != Grouping.APPLY)
return;
}
changeExecutor.submit( () -> {
synchronized (changeExecutor) {
@ -34,25 +36,24 @@ public class Changeable {
onChanged();
} );
}
}
protected void onChanged() {
}
public void beginChanges() {
synchronized (changeExecutor) {
synchronized (mutex) {
grouping = Grouping.BATCH;
}
}
public void ignoreChanges() {
synchronized (changeExecutor) {
synchronized (mutex) {
grouping = Grouping.IGNORE;
}
}
public boolean endChanges() {
synchronized (changeExecutor) {
synchronized (mutex) {
grouping = Grouping.APPLY;
if (changed) {

2
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java
View File

@ -159,7 +159,7 @@ public class MPFileSite extends MPBasicSite<MPFileQuestion> {
@Override
public int compareTo(final MPSite<?> o) {
int comparison = (o instanceof MPFileSite)? -getLastUsed().compareTo( ((MPFileSite) o).getLastUsed() ): 0;
int comparison = (o instanceof MPFileSite)? ((MPFileSite) o).getLastUsed().compareTo( getLastUsed() ): 0;
if (comparison != 0)
return comparison;

2
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java
View File

@ -171,7 +171,7 @@ public class MPFileUser extends MPBasicUser<MPFileSite> {
@Override
public int compareTo(final MPUser<?> o) {
int comparison = (o instanceof MPFileUser)? -getLastUsed().compareTo( ((MPFileUser) o).getLastUsed() ): 0;
int comparison = (o instanceof MPFileUser)? ((MPFileUser) o).getLastUsed().compareTo( getLastUsed() ): 0;
if (comparison != 0)
return comparison;

2
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java
View File

@ -19,6 +19,7 @@
package com.lyndir.masterpassword.model.impl;
import com.fasterxml.jackson.annotation.*;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.*;
@ -41,6 +42,7 @@ class MPJSONAnyObject {
@Override
@SuppressWarnings({ "ChainOfInstanceofChecks", "Contract" })
@SuppressFBWarnings({"EQ_UNUSUAL","EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS", "HE_EQUALS_USE_HASHCODE"})
public boolean equals(final Object obj) {
if (obj instanceof Collection<?>)
return ((Collection<?>) obj).isEmpty();

1
platform-independent/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java
View File

@ -82,7 +82,6 @@ public class MPJSONFile extends MPJSONAnyObject {
user.default_type = modelUser.getDefaultType();
// Section "sites"
if (sites == null)
sites = new LinkedHashMap<>();
for (final MPFileSite modelSite : modelUser.getSites()) {
String content = null, loginContent = null;