Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/AppActions.java
Original file line number Diff line number Diff line change
Expand Up @@ -3407,7 +3407,7 @@ public OpenMRUCampaign(File file, int position) {
/*
* There is some extra space appearing to the right of the images, which sounds
* similar to what was reported in this bug (bottom half):
* http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5047379 Removing the
* https://bugs.java.com/bugdatabase/JDK-5047379 Removing the
* mnemonic will remove this extra space.
*/
putValue(Action.SHORT_DESCRIPTION, htmlTip);
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/net/rptools/maptool/client/MapTool.java
Original file line number Diff line number Diff line change
Expand Up @@ -1757,16 +1757,15 @@ public SentryEvent process(@Nonnull SentryEvent event, @Nullable Hint hint) {
log.error("msg.error.genesysFont", e);
}

/**
/*
* This is a tweak that makes the Chinese version work better.
*
* <p>Consider reviewing <a href="http://en.wikipedia.org/wiki/CJK_characters" >http://en.
* wikipedia.org/wiki/CJK_characters</a> before making changes. And
* http://www.scarfboy.com/coding/unicode-tool is also a really cool site.
* Consider reviewing https://en.wikipedia.org/wiki/CJK_characters before making changes. And
* https://unicode.scarfboy.com/ is also a really cool site.
*/
if (Locale.CHINA.equals(Locale.getDefault())) {
// The following font name appears to be "Sim Sun". It can be downloaded
// from here: http://fr.cooltext.com/Fonts-Unicode-Chinese
// from here: https://fr.cooltext.com/Fonts-Unicode-Chinese
Font f = new Font("\u65B0\u5B8B\u4F53", Font.PLAIN, 12);
FontUIResource fontRes = new FontUIResource(f);
for (Iterator<Object> iterator = UIManager.getDefaults().keySet().iterator();
Expand Down
62 changes: 0 additions & 62 deletions src/main/java/net/rptools/maptool/client/WebDownloader.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*/
public class StrPropFunctions extends AbstractFunction {
// Changed to allow spaces within keys, although spaces on either end of keys or
// values will be trimmed. http://forums.rptools.net/viewtopic.php?f=3&t=23841
// values will be trimmed. https://forums.rptools.net/viewtopic.php?f=3&t=23841
// Added "." to allowed key names since variable names can contain dots.
private static final String keyValuePatt = "\\s*([\\w .]+)\\s*=\\s*(.*)";
private static final Pattern keyValueParser = Pattern.compile(keyValuePatt);
Expand Down Expand Up @@ -91,7 +91,7 @@ public static void parse(
delimPatt = fullyQuoteString(delim);
}
// Changed to allow spaces within keys, although spaces on either end of keys or
// values will be trimmed. http://forums.rptools.net/viewtopic.php?f=3&t=23841
// values will be trimmed. https://forums.rptools.net/viewtopic.php?f=3&t=23841
// Added "." to allowed key names since variable names can contain dots.
final String entryPatt = "\\s*([\\w .]+\\s*=.*?)" + delimPatt + "|([\\w .]+\\s*=.*)";
final Pattern entryParser = Pattern.compile(entryPatt);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ protected JMenu createHelpMenu() {
new JMenuItem(
new OpenUrlAction(
"action.helpurl.04",
"http://forums.rptools.net/viewtopic.php?f=22&t=3370",
"https://forums.rptools.net/viewtopic.php?f=22&t=3370",
Icons.MENU_NETWORK_SETUP)));
menu.add(
new JMenuItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

/**
* A custom Composite class to replace AlphaComposite for the purposes of mixing lights, auras, and
* other colored effects. <a
* href="http://www.java2s.com/Code/Java/2D-Graphics-GUI/BlendCompositeDemo.htm">...</a>
* other colored effects.
*/
public class LightingComposite implements Composite {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ private static String modifySortString(String str) {
return result.toString();
}

// function found at http://www.rgagnon.com/javadetails/java-0448.html
// function found at https://www.rgagnon.com/javadetails/java-0448.html
// to pad a string by inserting additional characters
public static String paddingString(String s, int n, char c, boolean paddingLeft) {
StringBuilder str = new StringBuilder(s);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@

#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
# This software copyright by various authors including the RPTools.net
# development team, and licensed under the LGPL Version 3 or, at your
# option, any later version.
Expand Down Expand Up @@ -50,7 +48,7 @@
# Check the javadoc for the 'MessageFormat' class for more details on
# the formatting of text in this file, as you'll see below (basically
# anything with braces):
# http://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# https://download.oracle.com/javase/7/docs/api/java/text/MessageFormat.html
# Localization contributed by David Herman ("aku" on forums.rptools.net)

ApplicationName = MapTool
Expand Down
Loading
Loading