--- old/src/jdk.jpackage/share/native/libapplauncher/IniFile.h 2019-11-18 21:03:47.043256900 -0500 +++ /dev/null 2019-11-18 21:03:48.000000000 -0500 @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code 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 - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -#ifndef INIFILE_H -#define INIFILE_H - -#include "Platform.h" -#include "OrderedMap.h" - -#include - - -class IniSectionData : public IPropertyContainer { -private: - OrderedMap FMap; - -public: - IniSectionData(); - IniSectionData(OrderedMap Values); - - std::vector GetKeys(); - std::list GetLines(); - OrderedMap GetData(); - - bool SetValue(const TString Key, TString Value); - void Append(OrderedMap Values); - - virtual bool GetValue(const TString Key, TString& Value); - virtual size_t GetCount(); -}; - - -class IniFile : public ISectionalPropertyContainer { -private: - OrderedMap FMap; - -public: - IniFile(); - virtual ~IniFile(); - - void internalTest(); - - bool LoadFromFile(const TString FileName); - bool SaveToFile(const TString FileName, bool ownerOnly = true); - - void Append(const TString SectionName, const TString Key, TString Value); - void AppendSection(const TString SectionName, - OrderedMap Values); - bool SetValue(const TString SectionName, - const TString Key, TString Value); - - // ISectionalPropertyContainer - virtual bool GetSection(const TString SectionName, - OrderedMap &Data); - virtual bool ContainsSection(const TString SectionName); - virtual bool GetValue(const TString SectionName, - const TString Key, TString& Value); -}; - -#endif // INIFILE_H --- /dev/null 2019-11-18 21:03:48.000000000 -0500 +++ new/src/jdk.incubator.jpackage/share/native/libapplauncher/IniFile.h 2019-11-18 21:03:43.460338100 -0500 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code 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 + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef INIFILE_H +#define INIFILE_H + +#include "Platform.h" +#include "OrderedMap.h" + +#include + + +class IniSectionData : public IPropertyContainer { +private: + OrderedMap FMap; + +public: + IniSectionData(); + IniSectionData(OrderedMap Values); + + std::vector GetKeys(); + std::list GetLines(); + OrderedMap GetData(); + + bool SetValue(const TString Key, TString Value); + void Append(OrderedMap Values); + + virtual bool GetValue(const TString Key, TString& Value); + virtual size_t GetCount(); +}; + + +class IniFile : public ISectionalPropertyContainer { +private: + OrderedMap FMap; + +public: + IniFile(); + virtual ~IniFile(); + + void internalTest(); + + bool LoadFromFile(const TString FileName); + bool SaveToFile(const TString FileName, bool ownerOnly = true); + + void Append(const TString SectionName, const TString Key, TString Value); + void AppendSection(const TString SectionName, + OrderedMap Values); + bool SetValue(const TString SectionName, + const TString Key, TString Value); + + // ISectionalPropertyContainer + virtual bool GetSection(const TString SectionName, + OrderedMap &Data); + virtual bool ContainsSection(const TString SectionName); + virtual bool GetValue(const TString SectionName, + const TString Key, TString& Value); +}; + +#endif // INIFILE_H