[Jrisk-cvs] SF.net SVN: domination-code:[2693] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2693] Domination
|
From: <yu...@us...> - 2025-10-14 13:06:33
|
Revision: 2693
http://sourceforge.net/p/domination/code/2693
Author: yuranet
Date: 2025-10-14 13:06:31 +0000 (Tue, 14 Oct 2025)
Log Message:
-----------
move mini lobby client to external lib
Modified Paths:
--------------
Domination/android/build.gradle
Domination/build.gradle
Domination/swingUI/build.xml
Domination/swingUI/src/META-INF/MANIFEST.MF
Added Paths:
-----------
Domination/sharedUI/lib/
Domination/sharedUI/lib/LobbyCore.jar
Domination/sharedUI/lib/MiniLobbyClient.jar
Removed Paths:
-------------
Domination/android/libs/LobbyCore.jar
Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/
Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/AnalogClock.java
Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/ViewChooser.java
Modified: Domination/android/build.gradle
===================================================================
--- Domination/android/build.gradle 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/android/build.gradle 2025-10-14 13:06:31 UTC (rev 2693)
@@ -20,7 +20,6 @@
implementation files('libs/achartengine-1.2.0.jar')
implementation files('libs/GoogleAdMobAdsSdk-6.4.1.jar')
implementation files('libs/GrasshopperAndroid.jar')
- implementation files('libs/LobbyCore.jar')
compileOnly files('libs/amazon-device-messaging-1.2.0.jar')
implementation 'androidx.annotation:annotation:1.2.0'
implementation 'androidx.core:core:1.3.2' // for FileProvider
@@ -31,7 +30,12 @@
}
android {
- compileOptions.encoding = 'cp1252'
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ encoding = "cp1252"
+ }
+
// updating to 35 may require a update of the gradle plugin!!
compileSdkVersion 34
buildToolsVersion '34.0.0'
Deleted: Domination/android/libs/LobbyCore.jar
===================================================================
(Binary files differ)
Modified: Domination/build.gradle
===================================================================
--- Domination/build.gradle 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/build.gradle 2025-10-14 13:06:31 UTC (rev 2693)
@@ -29,7 +29,7 @@
// some things are broken when moving to org.apache.httpcomponents:http 4.2+
implementation 'org.apache.httpcomponents:httpcore:4.1.2'
implementation 'org.apache.httpcomponents:httpmime:4.1.2'
- api fileTree(dir: 'android/libs', include: 'LobbyCore.jar') // TODO lib should be in shared folder
+ api fileTree(dir: 'sharedUI/lib', include: ['LobbyCore.jar', 'MiniLobbyClient.jar'])
api project(":SwingME")
// these are needed for compile only, the actual versions used are specific to android/ios
Copied: Domination/sharedUI/lib/LobbyCore.jar (from rev 2692, Domination/android/libs/LobbyCore.jar)
===================================================================
(Binary files differ)
Added: Domination/sharedUI/lib/MiniLobbyClient.jar
===================================================================
(Binary files differ)
Index: Domination/sharedUI/lib/MiniLobbyClient.jar
===================================================================
--- Domination/sharedUI/lib/MiniLobbyClient.jar 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/sharedUI/lib/MiniLobbyClient.jar 2025-10-14 13:06:31 UTC (rev 2693)
Property changes on: Domination/sharedUI/lib/MiniLobbyClient.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/AnalogClock.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/AnalogClock.java 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/AnalogClock.java 2025-10-14 13:06:31 UTC (rev 2693)
@@ -1,128 +0,0 @@
-package net.yura.swingme.core;
-
-import java.util.Calendar;
-import net.yura.mobile.gui.Font;
-import net.yura.mobile.gui.Graphics2D;
-import net.yura.mobile.gui.components.Component;
-import net.yura.mobile.gui.layout.XULLoader;
-import net.yura.mobile.gui.plaf.Style;
-
-public class AnalogClock extends Component {
-
- private double diam = 0.38;
- private double LineLengthSeconds = 0.90;
- private double LineLengthMinutes = 0.75;
- private double LineLengthHour = 0.50;
- private double LineLengthTicks = 0.08;
- private double TextPositionRelativeR = 1.22;
-
- Font Font;
- Calendar _now;
- boolean drawNumbers;
- boolean drawSecondhand;
- boolean drawTicks;
-
- public AnalogClock() {
- }
-
- private int pointX(double minute, double radius, int _circleCenterX) {
- double angle = minute * Math.PI / 30.0;
- return (int) ((double) _circleCenterX + radius * Math.sin(angle));
- }
-
- private int pointY(double minute, double radius, int oy) {
- double angle = minute * Math.PI / 30.0;
- return (int) ((double) oy - radius * Math.cos(angle));
- }
-
- public void paintComponent(Graphics2D g) {
-
- int oldStroke = g.getGraphics().getStrokeWidth();
- g.getGraphics().setStrokeWidth(Math.max(1, XULLoader.adjustSizeToDensity(1)));
-
- int Width = getWidth();
- int Height = getHeight();
-
- int size = Math.min(Width, Height);
- int _raduis = (int) (diam * (double) size);
- int _circleCenterX = size / 2;
- int _circleCenterY = size / 2;
-
-
- g.setColor( getForeground() );
-
- // draw circle
- g.drawArc(_circleCenterX - _raduis, _circleCenterY - _raduis, _raduis * 2, _raduis * 2, 0, 360);
-
- // set text's font
- g.setFont(Font);
- int textH = Font.getHeight();
-
- // draw ticks & digits
- int textW;
- for (int hour = 1; hour <= 12; hour++) {
- double angle = hour * 60.0 / 12.0;
- if (drawTicks) {
- g.drawLine(
- pointX(angle, _raduis * (1 - LineLengthTicks), _circleCenterX),
- pointY(angle, _raduis * (1 - LineLengthTicks), _circleCenterY),
- pointX(angle, _raduis, _circleCenterX),
- pointY(angle, _raduis, _circleCenterY));
- }
- if (drawNumbers) {
- // texts
- textW = Font.getWidth("" + hour);
- g.drawString("" + hour,
- (int) pointX(angle, _raduis * TextPositionRelativeR, _circleCenterX) - textW / 2,
- (int) pointY(angle, _raduis * TextPositionRelativeR, _circleCenterY) - textH / 2
- );
- }
- }
-
- double hour = _now.get(Calendar.HOUR) * 60.0 / 12.0;
- double minute = _now.get(Calendar.MINUTE);
- double second = _now.get(Calendar.SECOND);
-
- // draw hour line
- g.drawLine(_circleCenterX, _circleCenterY,
- pointX(hour + (double) minute / 12.0, _raduis * LineLengthHour, _circleCenterX),
- pointY(hour + (double) minute / 12.0, _raduis * LineLengthHour, _circleCenterY));
-
- // draw minutes line
- g.drawLine(_circleCenterX, _circleCenterY,
- pointX(minute + second / 60.0, _raduis * LineLengthMinutes, _circleCenterX),
- pointY(minute + second / 60.0, _raduis * LineLengthMinutes, _circleCenterY));
-
- if (drawSecondhand) {
- // draw seconds line
- g.drawLine(_circleCenterX, _circleCenterY,
- pointX((double) second, _raduis * LineLengthSeconds, _circleCenterX),
- pointY((double) second, _raduis * LineLengthSeconds, _circleCenterY));
- }
-
- g.getGraphics().setStrokeWidth(oldStroke);
- }
-
- public void updateUI() {
- super.updateUI();
- Font = theme.getFont(Style.ALL);
- }
-
- protected String getDefaultName() {
- return "AnalogClock";
- }
-
- protected boolean getDefaultEnabled() {
- return false;
- }
-
- protected void workoutMinimumSize() {
- width=10;
- height=10;
- }
-
- public void setTime(Calendar time) {
- _now = time;
- }
-
-}
Deleted: Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/ViewChooser.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/ViewChooser.java 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/swingme/core/ViewChooser.java 2025-10-14 13:06:31 UTC (rev 2693)
@@ -1,149 +0,0 @@
-package net.yura.swingme.core;
-
-import java.util.Arrays;
-import java.util.List;
-import javax.microedition.lcdui.Graphics;
-import net.yura.domination.engine.JavaCompatUtil;
-import net.yura.domination.engine.RiskUtil;
-import net.yura.mobile.gui.ActionListener;
-import net.yura.mobile.gui.ButtonGroup;
-import net.yura.mobile.gui.components.Button;
-import net.yura.mobile.gui.components.ComboBox;
-import net.yura.mobile.gui.components.Panel;
-import net.yura.mobile.gui.layout.BorderLayout;
-import net.yura.mobile.gui.layout.BoxLayout;
-import net.yura.mobile.gui.layout.FlowLayout;
-import net.yura.mobile.util.Option;
-
-/**
- * @author Yura Mamyrin
- */
-public class ViewChooser extends Panel implements ActionListener {
-
- Option[] options;
- ActionListener actionListener;
- String actionCommand;
- boolean stretchCombo;
-
- public ViewChooser(Option[] pp) {
- options = pp;
-
- Button test = new Button("test");
- test.workoutPreferredSize();
-
- setPreferredSize(10, test.getHeightWithBorder()); // some small size, but we will stretch
- }
-
- public void setStretchCombo(boolean stretch) {
- stretchCombo = stretch;
- }
-
- public void addActionListener(ActionListener al) {
- actionListener = al;
- }
- public void setActionCommand(String com) {
- actionCommand = com;
- }
-
- public void setSize(int width, int height) {
- if (width != getWidth() || height != getHeight()) {
-
- Option currentOption = getSelectedItem();
-
- int buttonsWidth = 0;
- Button[] buttons = new Button[options.length];
- for (int c = 0; c < buttons.length; c++) {
- buttons[c] = new Button(options[c].getValue());
-
- if (c == 0) {
- buttons[c].setName("SegmentedControlLeft");
- }
- else if (c == (buttons.length - 1)) {
- buttons[c].setName("SegmentedControlRight");
- }
- else {
- buttons[c].setName("SegmentedControlMiddle");
- }
-
- buttons[c].workoutPreferredSize();
- buttonsWidth = buttonsWidth + buttons[c].getWidthWithBorder();
- }
-
- if (buttonsWidth <= width) {
- setLayout(new FlowLayout(Graphics.HCENTER, 0));
- ButtonGroup group = new ButtonGroup();
- for (int c = 0; c < buttons.length; c++) {
- Button b = buttons[c];
- b.setActionCommand(options[c].getKey());
- if (currentOption == options[c]) {
- b.setSelected(true);
- }
- group.add(b);
- b.addActionListener(this);
- add(b);
- }
- // remove the rest
- while (getComponentCount() > buttons.length) {
- remove(0);
- }
- }
- else {
- ComboBox combo = new ComboBox(JavaCompatUtil.asVector(Arrays.asList(options)));
- combo.setSelectedItem(currentOption);
- combo.workoutPreferredSize();
- combo.addActionListener(this);
- setLayout(stretchCombo || combo.getWidthWithBorder() > width ? new BorderLayout() : new BoxLayout(Graphics.HCENTER));
- insert(combo, 0);
- // remove the rest
- while (getComponentCount() > 1) {
- remove(1);
- }
- }
- // we do the removing after we add the new component so that other threads
- // can still call getSelectedItem() while this is happening and get a value
- }
-
- super.setSize(width, height);
- }
-
- public void actionPerformed(String ac) {
- actionListener.actionPerformed(actionCommand);
- }
-
- public Option getSelectedItem() {
-
- List components = getComponents();
- if (components.isEmpty()) {
- return options[0]; // default
- }
- else {
- Object one = components.get(0);
- if (one instanceof ComboBox) {
- return (Option) ((ComboBox)one).getSelectedItem();
- }
- else {
- ButtonGroup bg = ((Button)one).getGroup();
- String id = bg.getSelection().getActionCommand();
- for (int c=0;c<options.length;c++) {
- if (id.equals( options[c].getKey() ) ) {
- return options[c];
- }
- }
- throw new RuntimeException("can not find option with id: "+id);
- }
- }
- }
-
- public void resetMapView() {
- List components = getComponents();
- if (components.isEmpty()) {
- // do nothing
- }
- else if (components.get(0) instanceof ComboBox) {
- ((ComboBox)components.get(0)).setSelectedIndex(0);
- }
- else {
- ((Button)components.get(0)).setSelected(true);
- }
- }
-}
Modified: Domination/swingUI/build.xml
===================================================================
--- Domination/swingUI/build.xml 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/swingUI/build.xml 2025-10-14 13:06:31 UTC (rev 2693)
@@ -56,7 +56,7 @@
<property name="dir.dist" location="dist"/>
<property name="dir.sources" location="../src:src:../sharedUI/src_mapstore_lobby"/>
<property name="dir.properties" location="../src"/>
- <property name="dir.libs" location="lib/httpmime-4.1.2.jar;lib/httpcore-4.1.2.jar;lib/jnlp.jar;lib/TranslationTool.jar;lib/SwingME.jar;lib/midletrunner.jar;lib/Grasshopper.jar;lib/LobbyClient.jar;lib/jfreechart-1.0.15.jar;lib/jcommon-1.0.18.jar;lib/jlayer-1.0.1.4.jar;lib/mp3spi-1.9.5.4.jar;lib/tritonus-share-0.3.7.4.jar"/>
+ <property name="dir.libs" location="lib/httpmime-4.1.2.jar;lib/httpcore-4.1.2.jar;lib/jnlp.jar;lib/TranslationTool.jar;lib/SwingME.jar;lib/midletrunner.jar;lib/Grasshopper.jar;lib/LobbyClient.jar;../sharedUI/lib/MiniLobbyClient.jar;lib/jfreechart-1.0.15.jar;lib/jcommon-1.0.18.jar;lib/jlayer-1.0.1.4.jar;lib/mp3spi-1.9.5.4.jar;lib/tritonus-share-0.3.7.4.jar"/>
<property name="file.src" location="${dir.dist}/src.zip"/>
@@ -200,6 +200,7 @@
<copy todir="${dir.build.game}/lib">
<!-- Desktop libs -->
<fileset dir="lib" includes="SwingME.jar,midletrunner.jar,m3gbasic.jar,TranslationTool.jar,Grasshopper.jar,LobbyClient.jar,httpmime-4.1.2.jar,httpcore-4.1.2.jar,jlayer-1.0.1.4.jar,mp3spi-1.9.5.4.jar,tritonus-share-0.3.7.4.jar"/>
+ <fileset dir="../sharedUI/lib" includes="MiniLobbyClient.jar"/>
</copy>
@@ -543,7 +544,7 @@
<copy file="../gpl.txt" todir="${dir.lobby.dist.client}/${game.name}"/>
<copy file="../ChangeLog.txt" todir="${dir.lobby.dist.client}/${game.name}"/>
-
+
<copy todir="${dir.lobby.dist.client}/${game.name}/help">
<fileset dir="game/${game.name}/help" includes="**/*.*"/>
</copy>
@@ -630,7 +631,7 @@
<jar destfile="dist/${game.name}4ME.jar" basedir="${dir.build}/swingme">
<manifest>
<attribute name="Main-Class" value="org.me4se.MIDletRunner" />
- <attribute name="Class-Path" value="lib/midletrunner.jar lib/m3gbasic.jar lib/SwingME.jar lib/Grasshopper.jar lib/LobbyCore.jar lib/LobbyClient.jar lib/jlayer-1.0.1.4.jar lib/mp3spi-1.9.5.4.jar lib/tritonus-share-0.3.7.4.jar" />
+ <attribute name="Class-Path" value="lib/midletrunner.jar lib/m3gbasic.jar lib/SwingME.jar lib/Grasshopper.jar lib/LobbyClient.jar lib/MiniLobbyClient.jar lib/jlayer-1.0.1.4.jar lib/mp3spi-1.9.5.4.jar lib/tritonus-share-0.3.7.4.jar" />
<attribute name="MIDlet-1" value="Flash GUI,,net.yura.domination.mobile.flashgui.DominationMain" />
</manifest>
</jar>
Modified: Domination/swingUI/src/META-INF/MANIFEST.MF
===================================================================
--- Domination/swingUI/src/META-INF/MANIFEST.MF 2025-10-10 00:11:58 UTC (rev 2692)
+++ Domination/swingUI/src/META-INF/MANIFEST.MF 2025-10-14 13:06:31 UTC (rev 2693)
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
Created-By: Yura Mamyrin (yu...@yu...)
Main-Class: net.yura.domination.ui.flashgui.MainMenu
-Class-Path: lib/TranslationTool.jar lib/Grasshopper.jar lib/SwingME.jar lib/midletrunner.jar lib/m3gbasic.jar lib/httpmime-4.1.2.jar lib/httpcore-4.1.2.jar lib/LobbyClient.jar lib/jfreechart-1.0.15.jar lib/jcommon-1.0.18.jar lib/jlayer-1.0.1.4.jar lib/mp3spi-1.9.5.4.jar lib/tritonus-share-0.3.7.4.jar
+Class-Path: lib/TranslationTool.jar lib/Grasshopper.jar lib/SwingME.jar lib/midletrunner.jar lib/m3gbasic.jar lib/httpmime-4.1.2.jar lib/httpcore-4.1.2.jar lib/LobbyClient.jar lib/MiniLobbyClient.jar lib/jfreechart-1.0.15.jar lib/jcommon-1.0.18.jar lib/jlayer-1.0.1.4.jar lib/mp3spi-1.9.5.4.jar lib/tritonus-share-0.3.7.4.jar
|
