[Jrisk-cvs] SF.net SVN: domination-code:[2628] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2628] Domination
|
From: <yu...@us...> - 2025-02-04 21:07:13
|
Revision: 2628
http://sourceforge.net/p/domination/code/2628
Author: yuranet
Date: 2025-02-04 21:07:11 +0000 (Tue, 04 Feb 2025)
Log Message:
-----------
move util method
Modified Paths:
--------------
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/ColorPicker.java
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
Domination/src/net/yura/domination/engine/ColorUtil.java
Domination/src/net/yura/domination/engine/JavaCompatUtil.java
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java 2025-01-28 10:47:08 UTC (rev 2627)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java 2025-02-04 21:07:11 UTC (rev 2628)
@@ -308,21 +308,4 @@
OptionPane.showMessageDialog(null,"Unable to open manual: "+e.getMessage(),"Error", OptionPane.ERROR_MESSAGE);
}
}
-
- public static String listToCsv(List<String> listOfStrings, char separator) {
- StringBuilder sb = new StringBuilder();
-
- // all but last
- for(int i = 0; i < listOfStrings.size() - 1 ; i++) {
- sb.append(listOfStrings.get(i));
- sb.append(separator);
- }
-
- // last string, no separator
- if(listOfStrings.size() > 0){
- sb.append(listOfStrings.get(listOfStrings.size()-1));
- }
-
- return sb.toString();
- }
}
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/ColorPicker.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/ColorPicker.java 2025-01-28 10:47:08 UTC (rev 2627)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/ColorPicker.java 2025-02-04 21:07:11 UTC (rev 2628)
@@ -2,7 +2,6 @@
import java.util.Arrays;
import net.yura.domination.engine.ColorUtil;
-import net.yura.domination.engine.RiskUtil;
import net.yura.domination.engine.translation.TranslationBundle;
import net.yura.domination.mobile.PicturePanel;
import net.yura.mobile.gui.ActionListener;
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2025-01-28 10:47:08 UTC (rev 2627)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/DominationMain.java 2025-02-04 21:07:11 UTC (rev 2628)
@@ -13,6 +13,7 @@
import java.util.prefs.Preferences;
import net.yura.domination.audio.SimpleAudio;
import net.yura.domination.audio.GameSound;
+import net.yura.domination.engine.JavaCompatUtil;
import net.yura.domination.engine.Risk;
import net.yura.domination.engine.RiskSettings;
import net.yura.domination.engine.RiskUtil;
@@ -483,7 +484,7 @@
public static void setAccounts(List<String> accounts) {
if (!accounts.isEmpty()) {
if (appPreferences != null) {
- appPreferences.put("accounts", MiniUtil.listToCsv(accounts, ','));
+ appPreferences.put("accounts", JavaCompatUtil.listToCsv(accounts, ','));
flushPreferences();
}
}
Modified: Domination/src/net/yura/domination/engine/ColorUtil.java
===================================================================
--- Domination/src/net/yura/domination/engine/ColorUtil.java 2025-01-28 10:47:08 UTC (rev 2627)
+++ Domination/src/net/yura/domination/engine/ColorUtil.java 2025-02-04 21:07:11 UTC (rev 2628)
@@ -119,7 +119,7 @@
* Returns the red component in the range 0-255 in the default sRGB
* space.
* @return the red component.
- * @see #getRGB
+ * @see java.awt.Color#getRed()
*/
public static int getRed(int rgb) {
return (rgb >> 16) & 0xFF;
@@ -129,7 +129,7 @@
* Returns the green component in the range 0-255 in the default sRGB
* space.
* @return the green component.
- * @see #getRGB
+ * @see java.awt.Color#getGreen()
*/
public static int getGreen(int rgb) {
return (rgb >> 8) & 0xFF;
@@ -139,7 +139,7 @@
* Returns the blue component in the range 0-255 in the default sRGB
* space.
* @return the blue component.
- * @see #getRGB
+ * @see java.awt.Color#getBlue()
*/
public static int getBlue(int rgb) {
return (rgb >> 0) & 0xFF;
@@ -148,7 +148,7 @@
/**
* Returns the alpha component in the range 0-255.
* @return the alpha component.
- * @see #getRGB
+ * @see java.awt.Color#getAlpha()
*/
public static int getAlpha(int rgb) {
return (rgb >> 24) & 0xff;
Modified: Domination/src/net/yura/domination/engine/JavaCompatUtil.java
===================================================================
--- Domination/src/net/yura/domination/engine/JavaCompatUtil.java 2025-01-28 10:47:08 UTC (rev 2627)
+++ Domination/src/net/yura/domination/engine/JavaCompatUtil.java 2025-02-04 21:07:11 UTC (rev 2628)
@@ -6,6 +6,7 @@
import java.util.Collection;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.logging.Level;
@@ -111,4 +112,21 @@
sb.append(delimiter);
}
}
+
+ public static String listToCsv(List<String> listOfStrings, char separator) {
+ StringBuilder sb = new StringBuilder();
+
+ // all but last
+ for(int i = 0; i < listOfStrings.size() - 1 ; i++) {
+ sb.append(listOfStrings.get(i));
+ sb.append(separator);
+ }
+
+ // last string, no separator
+ if(listOfStrings.size() > 0){
+ sb.append(listOfStrings.get(listOfStrings.size()-1));
+ }
+
+ return sb.toString();
+ }
}
|
