Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor code doc correction #12756

Closed
wants to merge 7 commits into from
Closed

Minor code doc correction #12756

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ee8714
12260-Pre & Post Refresh Hotkeys (#12694)
riverwanderer Sep 21, 2023
65c0933
fix that send "player x joined as side y" was not sent to other players.
riverwanderer Sep 27, 2023
d02d289
Merge remote-tracking branch 'origin/master'
riverwanderer Sep 27, 2023
7cd95ff
Revert "12260-Pre & Post Refresh Hotkeys (#12694)"
riverwanderer Sep 27, 2023
17c6df9
Merge branch 'vassalengine:master' into master
riverwanderer Sep 27, 2023
635bc26
filename extension - minor code doc fix.
riverwanderer Sep 28, 2023
6e7d448
remove spurious commit.
riverwanderer Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions vassal-app/src/main/java/VASSAL/build/module/PlayerRoster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ public void finish() {
if (GameModule.getGameModule().isMultiplayerConnected()) {
final Command c = new Chatter.DisplayText(GameModule.getGameModule().getChatter(), Resources.getString(GlobalOptions.getInstance().chatterHTMLSupport() ? "PlayerRoster.joined_side_2" : "PlayerRoster.joined_side", GameModule.getGameModule().getPrefs().getValue(GameModule.REAL_NAME), translateSide(newSide)));
c.execute();
GameModule.getGameModule().getServer().sendToOthers(c);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change intended to be included?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. That change is in PR #12750.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the only commit which should be in this PR is 635bc26, in that case.

Would you be able to drop the other commits? (The simplest way is probably an interactive rebase.)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not what I meant---the unnecessary commits are still there, plus one more which undoes them. What I was asking for was a rebase that takes those commits out of the PR.

}

final Add a = new Add(this, GameModule.getActiveUserId(), GlobalOptions.getInstance().getPlayerId(), newSide);
Expand Down
2 changes: 1 addition & 1 deletion vassal-app/src/main/java/VASSAL/tools/filechooser/FileChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ else if (mode == FILES_ONLY) {
public abstract void resetChoosableFileFilters();

/**
* Selects <tt>filename.sav</tt> if <tt>filename.foo</tt> is selected.
* Selects <tt>filename.vsav</tt> if <tt>filename.foo</tt> is selected.
*/
public void selectDotSavFile() {
final File file = getSelectedFile();
Expand Down