From 444d7e9b35a81b9615dab420f909d9a9700c3585 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Wed, 20 Sep 2017 12:43:03 -0400 Subject: [PATCH] Source fix-ups: single l marshal, copyright, .travis. --- .travis.yml | 2 +- core/c/{mpw-marshall.c => mpw-marshal.c} | 2 +- core/c/{mpw-marshall.h => mpw-marshal.h} | 6 ++-- .../IncorrectMasterPasswordException.java | 18 +++++++++++ .../masterpassword/model/MPMarshalFormat.java | 30 ++++++++++++++++- .../lyndir/masterpassword/model/MPSite.java | 18 +++++++++++ .../model/MPSiteMarshaller.java | 18 +++++++++++ .../masterpassword/model/MPSiteResult.java | 18 +++++++++++ .../model/MPSiteUnmarshaller.java | 18 +++++++++++ .../lyndir/masterpassword/model/MPUser.java | 18 +++++++++++ .../model/MPUserFileManager.java | 18 +++++++++++ .../masterpassword/model/MPUserManager.java | 18 +++++++++++ .../masterpassword/model/package-info.java | 18 +++++++++++ gradle/.idea/scopes/masterpassword.xml | 2 +- .../project.pbxproj | 12 +++---- .../project.pbxproj | 22 ++++++------- platform-darwin/Source/MPAppDelegate_Store.m | 2 +- platform-darwin/Source/iOS/MPiOSAppDelegate.m | 2 +- platform-independent/cli-c/cli/mpw-cli.c | 2 +- .../com/lyndir/masterpassword/gui/Config.java | 18 +++++++++++ .../com/lyndir/masterpassword/gui/GUI.java | 32 ++++++++++--------- .../com/lyndir/masterpassword/gui/Res.java | 18 +++++++++++ .../gui/model/IncognitoSite.java | 18 +++++++++++ .../gui/model/IncognitoUser.java | 18 +++++++++++ .../masterpassword/gui/model/ModelSite.java | 18 +++++++++++ .../masterpassword/gui/model/ModelUser.java | 18 +++++++++++ .../lyndir/masterpassword/gui/model/Site.java | 18 +++++++++++ .../lyndir/masterpassword/gui/model/User.java | 18 +++++++++++ .../gui/model/package-info.java | 18 +++++++++++ .../masterpassword/gui/package-info.java | 18 +++++++++++ .../gui/platform/mac/AppleGUI.java | 18 +++++++++++ .../masterpassword/gui/util/Components.java | 18 +++++++++++ .../gui/util/UnsignedIntegerModel.java | 18 +++++++++++ .../masterpassword/gui/util/package-info.java | 18 +++++++++++ .../gui/view/AuthenticationPanel.java | 18 +++++++++++ .../view/IncognitoAuthenticationPanel.java | 18 +++++++++++ .../gui/view/ModelAuthenticationPanel.java | 18 +++++++++++ .../gui/view/PasswordFrame.java | 18 +++++++++++ .../masterpassword/gui/view/UnlockFrame.java | 18 +++++++++++ 39 files changed, 576 insertions(+), 42 deletions(-) rename core/c/{mpw-marshall.c => mpw-marshal.c} (99%) rename core/c/{mpw-marshall.h => mpw-marshal.h} (97%) diff --git a/.travis.yml b/.travis.yml index 45de9f54..9df2d0e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,6 @@ git: script: - "( brew install libsodium json-c )" - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )" - - "( cd ./gradle && gradle test )" + - "( cd ./gradle && ./gradlew test )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator )" - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' )" diff --git a/core/c/mpw-marshall.c b/core/c/mpw-marshal.c similarity index 99% rename from core/c/mpw-marshall.c rename to core/c/mpw-marshal.c index 0c4a6829..6dc7fd4b 100644 --- a/core/c/mpw-marshall.c +++ b/core/c/mpw-marshal.c @@ -21,7 +21,7 @@ #include #include -#include "mpw-marshall.h" +#include "mpw-marshal.h" #include "mpw-util.h" #include "mpw-marshall-util.h" diff --git a/core/c/mpw-marshall.h b/core/c/mpw-marshal.h similarity index 97% rename from core/c/mpw-marshall.h rename to core/c/mpw-marshal.h index c5996f50..63f859eb 100644 --- a/core/c/mpw-marshall.h +++ b/core/c/mpw-marshal.h @@ -26,11 +26,11 @@ //// Types. typedef mpw_enum( unsigned int, MPMarshalFormat ) { - /** Generate a key for authentication. */ + /** Do not marshal. */ MPMarshalFormatNone, - /** Generate a key for authentication. */ + /** Marshal using the line-based plain-text format. */ MPMarshalFormatFlat, - /** Generate a name for identification. */ + /** Marshal using the JSON structured format. */ MPMarshalFormatJSON, #if MPW_JSON diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/IncorrectMasterPasswordException.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/IncorrectMasterPasswordException.java index a3d310aa..d62d6910 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/IncorrectMasterPasswordException.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/IncorrectMasterPasswordException.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; /** diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPMarshalFormat.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPMarshalFormat.java index f3216b28..77111257 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPMarshalFormat.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPMarshalFormat.java @@ -1,7 +1,35 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; /** * @author lhunath, 2017-09-20 */ -public class MPMarshalFormat { +public enum MPMarshalFormat { + /** + * Marshal using the line-based plain-text format. + */ + Flat, + /** + * Marshal using the JSON structured format. + */ + JSON; + + public static MPMarshalFormat DEFAULT = JSON; } diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java index 640893d9..8b8a6b6c 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import static com.lyndir.lhunath.opal.system.util.StringUtils.strf; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteMarshaller.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteMarshaller.java index 2c5396c6..c5adc20f 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteMarshaller.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteMarshaller.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java index 418caa4c..956bef3e 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import static com.lyndir.lhunath.opal.system.util.StringUtils.strf; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteUnmarshaller.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteUnmarshaller.java index cbc70c66..9c23c479 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteUnmarshaller.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteUnmarshaller.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java index 6ee79475..7cd4ea26 100755 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import static com.lyndir.lhunath.opal.system.util.StringUtils.*; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserFileManager.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserFileManager.java index 09ce273e..0844eeaa 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserFileManager.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserFileManager.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*; 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 428ce766..b36b819c 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 @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.model; import com.google.common.collect.*; diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java b/core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java index b68f6a36..3bb6e671 100644 --- a/core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java +++ b/core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + /** * * @author lhunath, 15-02-04 diff --git a/gradle/.idea/scopes/masterpassword.xml b/gradle/.idea/scopes/masterpassword.xml index 978deba8..42d84ba4 100644 --- a/gradle/.idea/scopes/masterpassword.xml +++ b/gradle/.idea/scopes/masterpassword.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index 77dd685f..1b41ceac 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -249,7 +249,7 @@ DAA1765219D8B82B0044227B /* copy_pw.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1763C19D8B82B0044227B /* copy_pw.png */; }; DAA1765319D8B82B0044227B /* choose_type@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1763D19D8B82B0044227B /* choose_type@2x.png */; }; DAA1765419D8B82B0044227B /* choose_type.png in Resources */ = {isa = PBXBuildFile; fileRef = DAA1763E19D8B82B0044227B /* choose_type.png */; }; - DAA449D21EEC4B5800E7BDD5 /* mpw-marshall.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D01EEC4B5800E7BDD5 /* mpw-marshall.c */; }; + DAA449D21EEC4B5800E7BDD5 /* mpw-marshal.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D01EEC4B5800E7BDD5 /* mpw-marshal.c */; }; DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = 93D3969393A3A46BD27D7078 /* mpw-algorithm.c */; }; DAB7AE5D1F3D752900C856B1 /* libjson-c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAB7AE5C1F3D752900C856B1 /* libjson-c.a */; }; DAB7AE771F3D755B00C856B1 /* libjson-c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAB7AE761F3D755B00C856B1 /* libjson-c.a */; }; @@ -871,8 +871,8 @@ DAA1763C19D8B82B0044227B /* copy_pw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = copy_pw.png; sourceTree = ""; }; DAA1763D19D8B82B0044227B /* choose_type@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "choose_type@2x.png"; sourceTree = ""; }; DAA1763E19D8B82B0044227B /* choose_type.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = choose_type.png; sourceTree = ""; }; - DAA449D01EEC4B5800E7BDD5 /* mpw-marshall.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshall.c"; sourceTree = ""; }; - DAA449D11EEC4B5800E7BDD5 /* mpw-marshall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshall.h"; sourceTree = ""; }; + DAA449D01EEC4B5800E7BDD5 /* mpw-marshal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal.c"; sourceTree = ""; }; + DAA449D11EEC4B5800E7BDD5 /* mpw-marshal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal.h"; sourceTree = ""; }; DAAC35DD156BD77D00C5FD93 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; DAB7AE5C1F3D752900C856B1 /* libjson-c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libjson-c.a"; path = "External/libjson-c/libjson-c-ios/lib/libjson-c.a"; sourceTree = ""; }; DAB7AE611F3D755B00C856B1 /* arraylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = arraylist.h; sourceTree = ""; }; @@ -1761,8 +1761,8 @@ 93D3990D850D76A94C6B7A4D /* mpw-algorithm.h */, DAB7AE981F3DDEE000C856B1 /* mpw-marshall-util.c */, DAB7AE971F3DDEE000C856B1 /* mpw-marshall-util.h */, - DAA449D01EEC4B5800E7BDD5 /* mpw-marshall.c */, - DAA449D11EEC4B5800E7BDD5 /* mpw-marshall.h */, + DAA449D01EEC4B5800E7BDD5 /* mpw-marshal.c */, + DAA449D11EEC4B5800E7BDD5 /* mpw-marshal.h */, 93D392C5A6572DB0EB5B82C8 /* mpw-types.c */, 93D39AFD17CBE324D745DAB0 /* mpw-types.h */, 93D396C311C3725870343EE0 /* mpw-util.c */, @@ -3970,7 +3970,7 @@ DABD3C151711E2DC00CF925C /* MPiOSAppDelegate.m in Sources */, DA0CC5941EB6B030009A8ED9 /* MPSiteEntity+CoreDataClass.m in Sources */, DABD3C1C1711E2DC00CF925C /* MPGuideViewController.m in Sources */, - DAA449D21EEC4B5800E7BDD5 /* mpw-marshall.c in Sources */, + DAA449D21EEC4B5800E7BDD5 /* mpw-marshal.c in Sources */, DABD3C1E1711E2DC00CF925C /* MPPreferencesViewController.m in Sources */, DABD3C1F1711E2DC00CF925C /* MPTypeViewController.m in Sources */, DABD3C211711E2DC00CF925C /* MPiOSConfig.m in Sources */, diff --git a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj index f7a1ea4d..fd59e6f0 100644 --- a/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-macOS.xcodeproj/project.pbxproj @@ -31,7 +31,7 @@ DA16B342170661E0000A0EAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; }; DA16B344170661EE000A0EAB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B343170661EE000A0EAB /* Cocoa.framework */; }; DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC77CAD148291A600BCF976 /* libPearl.a */; }; - DA1C7AAA1F1A8F24009A3551 /* mpw-marshall.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D31EEC4B6B00E7BDD5 /* mpw-marshall.c */; }; + DA1C7AAA1F1A8F24009A3551 /* mpw-marshal.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */; }; DA1C7AAB1F1A8F24009A3551 /* mpw-types.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C21A4746AF004F356A /* mpw-types.c */; }; DA1C7AAC1F1A8F24009A3551 /* mpw-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C51A4746AF004F356A /* mpw-util.c */; }; DA1C7AAD1F1A8F24009A3551 /* mpw-algorithm.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773BB1A4746AF004F356A /* mpw-algorithm.c */; }; @@ -121,7 +121,7 @@ DA9261521BE1A86700369DE5 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261501BE1A86700369DE5 /* Fabric.framework */; }; DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261531BE1A88900369DE5 /* libc++.tbd */; }; DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261551BE1A89600369DE5 /* libz.tbd */; }; - DAA449D51EEC4B6B00E7BDD5 /* mpw-marshall.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D31EEC4B6B00E7BDD5 /* mpw-marshall.c */; }; + DAA449D51EEC4B6B00E7BDD5 /* mpw-marshal.c in Sources */ = {isa = PBXBuildFile; fileRef = DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */; }; DAAA81B0195A8D1300FA30D9 /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = DAAA81AF195A8D1300FA30D9 /* gradient.png */; }; DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */; }; DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */; }; @@ -966,8 +966,8 @@ DA9261501BE1A86700369DE5 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = ""; }; DA9261531BE1A88900369DE5 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; DA9261551BE1A89600369DE5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - DAA449D31EEC4B6B00E7BDD5 /* mpw-marshall.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshall.c"; sourceTree = ""; }; - DAA449D41EEC4B6B00E7BDD5 /* mpw-marshall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshall.h"; sourceTree = ""; }; + DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-marshal.c"; sourceTree = ""; }; + DAA449D41EEC4B6B00E7BDD5 /* mpw-marshal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mpw-marshal.h"; sourceTree = ""; }; DAAA81AF195A8D1300FA30D9 /* gradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gradient.png; sourceTree = ""; }; DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = ""; }; DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = ""; }; @@ -1889,8 +1889,8 @@ DA6773BC1A4746AF004F356A /* mpw-algorithm.h */, DA7471A01F2B71A9005F3468 /* mpw-marshall-util.c */, DA7471A11F2B71A9005F3468 /* mpw-marshall-util.h */, - DAA449D31EEC4B6B00E7BDD5 /* mpw-marshall.c */, - DAA449D41EEC4B6B00E7BDD5 /* mpw-marshall.h */, + DAA449D31EEC4B6B00E7BDD5 /* mpw-marshal.c */, + DAA449D41EEC4B6B00E7BDD5 /* mpw-marshal.h */, DA6773C21A4746AF004F356A /* mpw-types.c */, DA6773C31A4746AF004F356A /* mpw-types.h */, DA6773C51A4746AF004F356A /* mpw-util.c */, @@ -2670,7 +2670,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - DA1C7AAA1F1A8F24009A3551 /* mpw-marshall.c in Sources */, + DA1C7AAA1F1A8F24009A3551 /* mpw-marshal.c in Sources */, DA1C7AAB1F1A8F24009A3551 /* mpw-types.c in Sources */, DA5B0B3D1F36467900B663F0 /* base64.c in Sources */, DAAF16661F5CA3240013B8AE /* mpw-cli-util.c in Sources */, @@ -2701,7 +2701,7 @@ DA5E5CF61724A667003798D8 /* MPAlgorithm.m in Sources */, DA2686201EBFD7A40001E37E /* MPSiteEntity+CoreDataProperties.m in Sources */, DA5E5CF71724A667003798D8 /* MPAlgorithmV0.m in Sources */, - DAA449D51EEC4B6B00E7BDD5 /* mpw-marshall.c in Sources */, + DAA449D51EEC4B6B00E7BDD5 /* mpw-marshal.c in Sources */, DA26861E1EBFD7A40001E37E /* MPGeneratedSiteEntity+CoreDataProperties.m in Sources */, DA5E5CF81724A667003798D8 /* MPAlgorithmV1.m in Sources */, DA2686231EBFD7A40001E37E /* MPStoredSiteEntity+CoreDataClass.m in Sources */, @@ -3048,7 +3048,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = NO; HEADER_SEARCH_PATHS = ( "\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"", - "/usr/include//libxml2", + /usr/include/libxml2, "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( @@ -3482,7 +3482,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = NO; HEADER_SEARCH_PATHS = ( "\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"", - "/usr/include//libxml2", + /usr/include/libxml2, "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( @@ -3502,7 +3502,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = NO; HEADER_SEARCH_PATHS = ( "\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/$(PLATFORM_NAME)/include\"", - "/usr/include//libxml2", + /usr/include/libxml2, "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( diff --git a/platform-darwin/Source/MPAppDelegate_Store.m b/platform-darwin/Source/MPAppDelegate_Store.m index df3b39ff..3d0805fa 100644 --- a/platform-darwin/Source/MPAppDelegate_Store.m +++ b/platform-darwin/Source/MPAppDelegate_Store.m @@ -17,7 +17,7 @@ //============================================================================== #import "MPAppDelegate_Store.h" -#import "mpw-marshall.h" +#import "mpw-marshal.h" #import "mpw-util.h" #if TARGET_OS_IPHONE diff --git a/platform-darwin/Source/iOS/MPiOSAppDelegate.m b/platform-darwin/Source/iOS/MPiOSAppDelegate.m index bb5dfc32..19d71d91 100644 --- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m +++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m @@ -20,7 +20,7 @@ #import "MPAppDelegate_Key.h" #import "MPAppDelegate_Store.h" #import "MPStoreViewController.h" -#import "mpw-marshall.h" +#import "mpw-marshal.h" @interface MPiOSAppDelegate() diff --git a/platform-independent/cli-c/cli/mpw-cli.c b/platform-independent/cli-c/cli/mpw-cli.c index ca50510c..f3e013dc 100644 --- a/platform-independent/cli-c/cli/mpw-cli.c +++ b/platform-independent/cli-c/cli/mpw-cli.c @@ -26,7 +26,7 @@ #include "mpw-cli-util.h" #include "mpw-algorithm.h" #include "mpw-util.h" -#include "mpw-marshall.h" +#include "mpw-marshal.h" /** Output the program's usage documentation. */ static void usage() { diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java index 8f25a05d..d28d575a 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui; import com.lyndir.lhunath.opal.system.util.ConversionUtils; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java index ee0f9150..bdfe7fb8 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java @@ -1,18 +1,20 @@ -/* - * Copyright 2008, Maarten Billemont - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== package com.lyndir.masterpassword.gui; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java index f9b66ea8..81c79313 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui; import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoSite.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoSite.java index 2c6d798a..5b5d333d 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoSite.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoSite.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.model; import com.google.common.primitives.UnsignedInteger; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoUser.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoUser.java index c5d70fc5..ca5d3f99 100755 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoUser.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/IncognitoUser.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.model; import com.google.common.collect.ImmutableList; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelSite.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelSite.java index c4552fec..08ed1a8d 100755 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelSite.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelSite.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.model; import com.google.common.primitives.UnsignedInteger; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelUser.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelUser.java index 42d31fd4..5c763261 100755 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelUser.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/ModelUser.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.model; import com.google.common.base.Function; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/Site.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/Site.java index 0f48a07f..454778de 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/Site.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/Site.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.model; import static com.lyndir.lhunath.opal.system.util.StringUtils.strf; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/User.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/User.java index 12f43587..31edfd28 100755 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/User.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/User.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.model; import com.google.common.base.Preconditions; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java index 0edad886..791bf234 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + /** * * @author lhunath, 15-02-04 diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java index 71c9ae39..5320e635 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + /** * * @author lhunath, 15-02-04 diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java index 514461a4..bd9746a7 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.platform.mac; import com.apple.eawt.*; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java index 55fdce2d..16f6ac60 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.util; import com.lyndir.masterpassword.gui.Res; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java index b294f820..0d8a8400 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.util; import com.google.common.primitives.UnsignedInteger; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java index 02b21dc7..3e7cdf6d 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + /** * * @author lhunath, 15-02-04 diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java index 55911622..882e2be0 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.view; import com.google.common.collect.ImmutableList; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java index 451c6399..56f8c5e2 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.view; import com.lyndir.masterpassword.gui.Res; diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java index 93d83c94..711d9367 100644 --- a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java +++ b/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.view; import static com.lyndir.lhunath.opal.system.util.StringUtils.strf; 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 abcb972a..d0f4391f 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 @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.view; import static com.lyndir.lhunath.opal.system.util.ObjectUtils.ifNotNullElse; 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 9d5d57f8..cd059b97 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 @@ -1,3 +1,21 @@ +//============================================================================== +// This file is part of Master Password. +// Copyright (c) 2011-2017, Maarten Billemont. +// +// Master Password is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Master Password is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You can find a copy of the GNU General Public License in the +// LICENSE file. Alternatively, see . +//============================================================================== + package com.lyndir.masterpassword.gui.view; import static com.lyndir.lhunath.opal.system.util.ObjectUtils.*;