Skip to content

Commit

Permalink
nifty: adapt to recent jme3-utilities-ui API changes
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengold committed Aug 21, 2021
1 parent ab23146 commit 1adb844
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions nifty/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ dependencies {
api 'com.github.nifty-gui:nifty:1.4.3'
api 'com.github.nifty-gui:nifty-default-controls:1.4.3'

api 'com.github.stephengold:jme3-utilities-ui:' + jme3utilitiesuiVersion
// api project(':ui')
// api 'com.github.stephengold:jme3-utilities-ui:' + jme3utilitiesuiVersion
api project(':ui')
}

// publishing tasks
Expand Down
4 changes: 2 additions & 2 deletions nifty/src/main/java/jme3utilities/nifty/bind/ActionItem.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2013-2017, Stephen Gold
Copyright (c) 2013-2021, Stephen Gold
All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -92,7 +92,7 @@ String getActionName() {
@Override
public String toString() {
String result = String.format(" %s", MyString.quote(actionName));
Collection<String> names = mode.listHotkeys(actionName);
Collection<String> names = mode.listHotkeysLocal(actionName);
if (!names.isEmpty()) {
result += String.format(": %s", formatList(names));
}
Expand Down
4 changes: 2 additions & 2 deletions nifty/src/main/java/jme3utilities/nifty/bind/HotkeyItem.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (c) 2013-2020, Stephen Gold
Copyright (c) 2013-2021, Stephen Gold
All rights reserved.
Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -120,7 +120,7 @@ public String toString() {
if (mode == null) {
return "";
}
String name = hotkey.name();
String name = hotkey.localName();
String result = String.format(" [ %s ] ... ", name);
if (isBound()) {
String action = mode.findActionName(hotkey);
Expand Down

0 comments on commit 1adb844

Please sign in to comment.