mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-15 20:29:52 +01:00
Accidentally conflated two identically named fields.
This commit is contained in:
@@ -2,7 +2,6 @@ package net.sf.briar.lifecycle;
|
|||||||
|
|
||||||
import static com.sun.jna.Library.OPTION_FUNCTION_MAPPER;
|
import static com.sun.jna.Library.OPTION_FUNCTION_MAPPER;
|
||||||
import static com.sun.jna.Library.OPTION_TYPE_MAPPER;
|
import static com.sun.jna.Library.OPTION_TYPE_MAPPER;
|
||||||
import static com.sun.jna.win32.W32APIFunctionMapper.UNICODE;
|
|
||||||
import static java.util.logging.Level.INFO;
|
import static java.util.logging.Level.INFO;
|
||||||
import static java.util.logging.Level.WARNING;
|
import static java.util.logging.Level.WARNING;
|
||||||
|
|
||||||
@@ -25,6 +24,8 @@ import com.sun.jna.platform.win32.WinDef.WPARAM;
|
|||||||
import com.sun.jna.platform.win32.WinUser.MSG;
|
import com.sun.jna.platform.win32.WinUser.MSG;
|
||||||
import com.sun.jna.win32.StdCallLibrary;
|
import com.sun.jna.win32.StdCallLibrary;
|
||||||
import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
|
import com.sun.jna.win32.StdCallLibrary.StdCallCallback;
|
||||||
|
import com.sun.jna.win32.W32APIFunctionMapper;
|
||||||
|
import com.sun.jna.win32.W32APITypeMapper;
|
||||||
|
|
||||||
class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
|
class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
|
||||||
|
|
||||||
@@ -42,8 +43,8 @@ class WindowsShutdownManagerImpl extends ShutdownManagerImpl {
|
|||||||
WindowsShutdownManagerImpl() {
|
WindowsShutdownManagerImpl() {
|
||||||
// Use the Unicode versions of Win32 API calls
|
// Use the Unicode versions of Win32 API calls
|
||||||
Map<String, Object> m = new HashMap<String, Object>();
|
Map<String, Object> m = new HashMap<String, Object>();
|
||||||
m.put(OPTION_TYPE_MAPPER, UNICODE);
|
m.put(OPTION_TYPE_MAPPER, W32APITypeMapper.UNICODE);
|
||||||
m.put(OPTION_FUNCTION_MAPPER, UNICODE);
|
m.put(OPTION_FUNCTION_MAPPER, W32APIFunctionMapper.UNICODE);
|
||||||
options = Collections.unmodifiableMap(m);
|
options = Collections.unmodifiableMap(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user