diff --git a/client/boardspace-maven/boardspace-maven.zip b/client/boardspace-maven/boardspace-maven.zip deleted file mode 100644 index 4046b4f24..000000000 Binary files a/client/boardspace-maven/boardspace-maven.zip and /dev/null differ diff --git a/client/boardspace-maven/boardspacedevelop/.project b/client/boardspace-maven/boardspacedevelop/.project index 0c540f2c0..c4245f985 100644 --- a/client/boardspace-maven/boardspacedevelop/.project +++ b/client/boardspace-maven/boardspacedevelop/.project @@ -14,13 +14,6 @@ org.eclipse.m2e.core.maven2Nature - - - codename1 - 2 - F:/github/boardspace.net/client/boardspace-codename1/codename1 - - 1643414471994 diff --git a/client/boardspace-maven/boardspacedevelop/android/.classpath b/client/boardspace-maven/boardspacedevelop/android/.classpath index f24c90e29..14a183415 100644 --- a/client/boardspace-maven/boardspacedevelop/android/.classpath +++ b/client/boardspace-maven/boardspacedevelop/android/.classpath @@ -1,6 +1,6 @@ - + diff --git a/client/boardspace-maven/boardspacedevelop/android/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (1).launch b/client/boardspace-maven/boardspacedevelop/android/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (1).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacedevelop/android/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (1).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacedevelop/android/.gitignore b/client/boardspace-maven/boardspacedevelop/android/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacedevelop/android/.project b/client/boardspace-maven/boardspacedevelop/android/.project index 6b5151136..d7126aa83 100644 --- a/client/boardspace-maven/boardspacedevelop/android/.project +++ b/client/boardspace-maven/boardspacedevelop/android/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (1).launch + @@ -20,6 +25,13 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + android + 2 + G:/share/projects/boardspace-codename1/native/android + + 1643340638973 diff --git a/client/boardspace-maven/boardspacedevelop/android/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacedevelop/android/.settings/org.eclipse.core.resources.prefs index abdea9ac0..99f26c020 100644 --- a/client/boardspace-maven/boardspacedevelop/android/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacedevelop/android/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacedevelop/android/pom.xml b/client/boardspace-maven/boardspacedevelop/android/pom.xml index 854b3db1a..c16ef7b59 100644 --- a/client/boardspace-maven/boardspacedevelop/android/pom.xml +++ b/client/boardspace-maven/boardspacedevelop/android/pom.xml @@ -25,12 +25,9 @@ - src/main/java + ../../../boardspace-codename1/native/android/ - - src/main/resources - - + com.codenameone diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries deleted file mode 100644 index 9b7a0c46e..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/NativeServerSocketImpl.java/1.1/Fri Nov 30 07:22:34 2018// -/SystemTimeImpl.java/1.2/Wed Jun 3 17:54:49 2020// -/InstallerPackageImpl.java/1.7/Sat Jun 19 19:28:20 2021// -D diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Extra b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Extra deleted file mode 100644 index 72f03454c..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Extra +++ /dev/null @@ -1,3 +0,0 @@ -/NativeServerSocketImpl.java///1543595950//// -/SystemTimeImpl.java///1598217866//// -/InstallerPackageImpl.java///1624576311//// diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Extra.Old deleted file mode 100644 index eae2e1fbd..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Extra.Old +++ /dev/null @@ -1,3 +0,0 @@ -/NativeServerSocketImpl.java///1543595950//// -/SystemTimeImpl.java///1598217866//// -/InstallerPackageImpl.java///1623877901//// diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Old b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Old deleted file mode 100644 index 78e99d860..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Entries.Old +++ /dev/null @@ -1,4 +0,0 @@ -/NativeServerSocketImpl.java/1.1/Fri Nov 30 07:22:34 2018// -/SystemTimeImpl.java/1.2/Wed Jun 3 17:54:49 2020// -/InstallerPackageImpl.java/1.6/Wed Jun 16 16:24:03 2021// -D diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Repository b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Repository deleted file mode 100644 index 93f2c312c..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/android/bridge diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/InstallerPackageImpl.java b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/InstallerPackageImpl.java deleted file mode 100644 index 1b64a6a93..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/InstallerPackageImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import android.app.Activity; -import com.codename1.impl.android.AndroidNativeUtil; -import android.content.pm.PackageManager; -import android.content.Context; -import android.content.pm.PackageInfo; -import android.content.pm.ActivityInfo; -import android.net.wifi.WifiManager; -import android.util.DisplayMetrics; -import android.os.Build; -import android.os.Build.VERSION; -import android.view.Display; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.nio.ByteOrder; -import java.math.BigInteger; -import android.os.Build; -import java.lang.reflect.Method; -import java.io.DataOutputStream; - -import android.app.Application; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; - - -public class InstallerPackageImpl { - // cribbed from various "drawer" source code, decompiled from the lastgameboard chess app./ - public static final String ANALYTICS_SENDER_PACKAGE = "com.lastgameboard.gameboardservicetest"; - public static String ACTION_CHANGE_VISIBILITY = "com.lastgameboard.gameboardservice.drawer.action_CHANGE_DRAWER_VISIBLITY"; - public static String EXTRA_CHANGE_VISIBILITY = "com.lastgameboard.gameboardservice.drawer.key.CHANGE_DRAWER_VISIBLITY_STATE"; - - public static void setDrawerVisibility(Application application, boolean z) - { - setDrawerVisibility(application.getApplicationContext(), z); - } - - public static void setDrawerVisibility(Context context, boolean z) - { - Intent intent = new Intent(); - intent.setAction(ACTION_CHANGE_VISIBILITY); - intent.putExtra(EXTRA_CHANGE_VISIBILITY, z ? 1 : 0); - intent.setComponent(new ComponentName(ANALYTICS_SENDER_PACKAGE, "com.lastgameboard.gameboardservice.drawer.DrawerVisibilityBroadcastReceiver")); - context.sendBroadcast(intent); - } - - public void setDrawers(boolean vis) - { Context c = AndroidNativeUtil.getContext(); - setDrawerVisibility(c,vis); - } - - public String eval(String command) - { - try{ - Context c = AndroidNativeUtil.getContext(); - Runtime.getRuntime().exec(command); - } - catch(Throwable e){ - return e.toString(); - } - return "ok"; - } - - public String getPackages() - { - Context c = AndroidNativeUtil.getContext(); - PackageManager pm = c.getPackageManager(); - java.util.List installedPackages = pm.getInstalledPackages(PackageManager.GET_ACTIVITIES); - String res = ""; - for (PackageInfo p : installedPackages) - { - res += " "+p.packageName; - } - return(res); - } - private double stableDensity(DisplayMetrics metrics) - { // very old versions of android didn't have this variable. Rather than try - // to guess, just punt if there is a problem - try { - return metrics.DENSITY_DEVICE_STABLE; - } - catch (Throwable err) - { - return(metrics.densityDpi); - } - } - public String getOSInfo() - { Context c = AndroidNativeUtil.getContext(); - DisplayMetrics metrics = c.getResources().getDisplayMetrics(); - //Display display = c.getDisplay(); - //DisplayMetrics metrics = new DisplayMetrics (); - //display.getMetrics(metrics); - - return("brand="+android.os.Build.BRAND +"\n" - +"board="+android.os.Build.BOARD +"\n" - +"manufacturer="+android.os.Build.MANUFACTURER +"\n" - +"product="+android.os.Build.PRODUCT +"\n" - +"model="+android.os.Build.MODEL +"\n" - +"hardware="+android.os.Build.HARDWARE +"\n" - +"device="+android.os.Build.DEVICE +"\n" - +"tags="+android.os.Build.TAGS +"\n" - +"display="+android.os.Build.DISPLAY +"\n" - +"DENSITY_DEVICE_STABLE="+stableDensity(metrics)+"\n" - +"density="+metrics.density+"\n" - +"densityDpi="+metrics.densityDpi+"\n" - +"scaledDensity="+metrics.scaledDensity+"\n" - +"widthPixels="+metrics.widthPixels+"\n" - +"xdpi="+metrics.xdpi+"\n" - +"heightPixels="+metrics.heightPixels+"\n" - +"ydpi="+metrics.ydpi+"\n" - - ); - } - public String getInstaller(String pack) - { // amazon to "com.amazon.venezia" as well to contrast with - // Google Play's "com.android.vending". - Context c = AndroidNativeUtil.getContext(); - PackageManager pm = c.getPackageManager(); - return(pm.getInstallerPackageName(pack)); - } - public int getOrientation() - { - Activity act = AndroidNativeUtil.getActivity(); - return(act.getRequestedOrientation()); - } - public int setOrientation(boolean portrait,boolean reverse) - { int newo = portrait - ? (reverse - ? ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT - : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) - : (reverse - ? ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE - : ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - setOrientation(newo); - return(newo); - } - - public void setOrientation(int o) - { - Activity act = AndroidNativeUtil.getActivity(); - //act.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED); - act.setRequestedOrientation(o); - } - public double getScreenDPI() - { - Context c = AndroidNativeUtil.getContext(); - DisplayMetrics metrics = c.getResources().getDisplayMetrics(); - //Display display = c.getDisplay(); - //DisplayMetrics metrics = new DisplayMetrics (); - //display.getMetrics(metrics); - - - long z = (long)metrics.densityDpi; - long y =(long)stableDensity(metrics); - long x = (long)metrics.xdpi; - long v = z + (x<<11)+ (y<<22); - return((double)v); - } - - public String getLocalWifiIpAddress() { - Context context = AndroidNativeUtil.getContext(); - WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - int ipAddress = wifiManager.getConnectionInfo().getIpAddress(); - - if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) { - ipAddress = Integer.reverseBytes(ipAddress); - } - - byte[] ipByteArray = BigInteger.valueOf(ipAddress).toByteArray(); - - String ipAddressString; - try { - ipAddressString = InetAddress.getByAddress(ipByteArray).getHostAddress(); - } catch (UnknownHostException ex) { - ipAddressString = null; - } - - return ipAddressString; - } - /** - * Retrieves the net.hostname system property - */ - public String getHostName() { - try { - Method getString = Build.class.getDeclaredMethod("getString", String.class); - getString.setAccessible(true); - return getString.invoke(null, "net.hostname").toString(); - } catch (Exception ex) { - return null; - } - } - - public void hardExit() { - AndroidNativeUtil.getActivity().finish(); - System.exit(0); - } - - public boolean isSupported() { - return true; - } - -} diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/NativeServerSocketImpl.java b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/NativeServerSocketImpl.java deleted file mode 100644 index 3e86e557c..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/NativeServerSocketImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import java.lang.Exception; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.util.Hashtable; -import java.net.ServerSocket; -/** - * this javase version of NativeServerSocket is essentially - * identical to the JavaSE version, which is in turn essentially - * identical to the plain java version. - * - * This implements server socket binding and an "accept" factory - * the key to it's success is that it also implements the raw I/O - * on the socket streams that the factory produces. - * - * @author Ddyer - * - */ -public class NativeServerSocketImpl implements bridge.NativeServerSocket -{ // - // native interfaces are restructed from returning objects, so instead - // it returns integers which act as handles for the underlying objects. - // - private HashtableobjectMap = new Hashtable(); - private HashtablereverseMap = new Hashtable(); - private int nextKey = 1000; - private Object find(int key) { return(objectMap.get(key)); } - private void forget(int key) { objectMap.remove(key); } - private int remember(Object something) - { int v = nextKey++; - objectMap.put(v,something); - return(v); - } - private int errorCode(String something) - { if(reverseMap.containsKey(something)) - { return reverseMap.get(something); - } - int v = -remember(something); - reverseMap.put(something, v); - return(v); - } - // - // native interfaces also can't throw errors, so errors are caught - // and their .toString() values are remembered. For general compatibility - // with i/o, values from -1 up are not errors. - // - public String getIOExceptionMessage(int handle) - { return ( (handle>-1) ? null : (String)(find(-handle))); - } - - // service for NativeOutputStream - public int write(int handle, int param1) { - try { - OutputStream o = (OutputStream)find(handle); - o.write(param1); - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int writeArray(int param, byte[] param1, int param2, int param3) - { try { - OutputStream stream = (OutputStream)find(param); - stream.write(param1,param2,param3); - return(0); - } catch (Exception e) - { return(errorCode(e.toString())); - } - } - - /* - * service for NativeInputStream - * - */ - public int read(int param) { - try { - InputStream s = (InputStream)find(param); - int val = s.read(); - return(val); - } - catch (Exception e) { return(errorCode(e.toString())); } - } - public int readArray(int param, byte[] param1, int param2, int param3) - { - try { - InputStream stream = (InputStream)find(param); - int v = stream.read(param1,param2,param3); - return(v); - }catch (Exception e) - { return(errorCode(e.toString())); - } - } - public int closeInput(int param) { - try { - InputStream stream = (InputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int closeSocket(int param) { - try { - Socket sock = (Socket)find(param); - if(sock!=null) { sock.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int closeOutput(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int flush(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.flush(); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - /* - * service for bind and accept - */ - private boolean bound = false; - private ServerSocket serverSocket = null; - public int unBind() - { try { - if(bound) - { - bound = false; - serverSocket.close(); - serverSocket=null; - } - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int bindSocket(int param) - { bound = false; - try { - serverSocket = new ServerSocket(param); - bound = true; - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - public int listen() { - if(bound) - { - try { - Socket listenSocket = serverSocket.accept(); - return(listenSocket==null ? -1 : remember(listenSocket)); - } catch (Exception e) { return(errorCode(e.toString())); } - } - else { return(errorCode("socket not bound")); } - } - - // the listener calls listen, then - // gets these handles and uses them to create - // input and output streams - public int getOutputHandle(int handle) - { try { - { Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) - { - return(remember(listenSocket.getOutputStream())); - } - else { return(errorCode("invalid socket handle")); } - } - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int getInputHandle(int handle) { - try { - Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) { return(remember(listenSocket.getInputStream())); } - else { return(errorCode("invalid socket handle")); } - } - catch (Exception e) { return(errorCode(e.toString())); } - } - - - public boolean isSupported() { - return true; - } - - public int connect(String host, int port) { - try { - @SuppressWarnings("resource") - Socket listenSocket = new Socket(host, port); - if(listenSocket!=null) { return(remember(listenSocket)); } - } catch (Exception err) { errorCode(err.toString()); } - return(-1); - } -} diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/SystemTimeImpl.java b/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/SystemTimeImpl.java deleted file mode 100644 index 7528c441c..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/bridge/SystemTimeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import android.os.SystemClock; - -public class SystemTimeImpl { - public long currentNanoTime() { - return SystemClock.elapsedRealtimeNanos(); - } - - public boolean isSupported() { - return true; - } - -} diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries b/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries deleted file mode 100644 index a930078c3..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/UdpListenerImpl.java/1.5/Wed Dec 8 18:02:44 2021// -D diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Extra b/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Extra deleted file mode 100644 index e80fa8f5a..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Extra +++ /dev/null @@ -1 +0,0 @@ -/UdpListenerImpl.java///1638987791//// diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Extra.Old deleted file mode 100644 index 806e921c0..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Extra.Old +++ /dev/null @@ -1 +0,0 @@ -/UdpListenerImpl.java///1622582052//// diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Old b/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Old deleted file mode 100644 index c012ca8a3..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Entries.Old +++ /dev/null @@ -1,2 +0,0 @@ -/UdpListenerImpl.java/1.4/Tue Jun 1 21:14:12 2021// -D diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Repository b/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Repository deleted file mode 100644 index 093f501ca..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/android/udp diff --git a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/UdpListenerImpl.java b/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/UdpListenerImpl.java deleted file mode 100644 index e3ae27d1b..000000000 --- a/client/boardspace-maven/boardspacedevelop/android/src/main/java/udp/UdpListenerImpl.java +++ /dev/null @@ -1,149 +0,0 @@ -package udp; - -import com.codename1.impl.android.AndroidNativeUtil; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; -import java.util.Vector; -import android.net.wifi.WifiManager; -import android.content.Context ; -import android.net.DhcpInfo ; -import java.util.Random; -/** - * android implementation of the UDP transmit/receive interface. This has - * just one important parameter, the port to broadcast on. - * - * This filters out our own messages by prepending a sender id to each - * message and recognising it. - * - * @author Ddyer - * - */ -public class UdpListenerImpl -{ - boolean exitRequest=false; - String senderId = "S"+(new Random().nextLong()&0x7fffffffffffffffL)+":"; - Vectormessages = new Vector(); - boolean filter=false; - /** - * get a message or wait a maximum amount of time for one to arrive. - * as usual, wait 0 means forever. wait -1 means wait never. - * otherwise wait time in milliseconds - * - * messages from this interface will begin with s....: or error: - * but remember that it's a public broadcast, so any kind of crap - * might occur. - * @param wait - * @return - */ - public String getMessage(int wait) - { synchronized(this) - { if(!exitRequest - && (wait>=0) - && (messages.size()==0)) - { try { wait(wait); } catch (InterruptedException e) {} } - } - synchronized (messages) - { - if(messages.size()>0) - { - return(messages.remove(0)); - }} - return(null); - } - - private InetAddress getBroadcastAddress() throws IOException - { - Context c = AndroidNativeUtil.getContext(); - WifiManager wifi = (WifiManager) c.getSystemService(Context.WIFI_SERVICE); - DhcpInfo dhcp = wifi.getDhcpInfo(); - // handle null somehow - int broadcast = (dhcp.ipAddress & dhcp.netmask) | ~dhcp.netmask; - byte[] quads = new byte[4]; - for (int k = 0; k < 4; k++) - quads[k] = (byte) ((broadcast >> k * 8) & 0xFF); - return InetAddress.getByAddress(quads); - } - - public boolean sendMessage(String msg,int broadcastPort) - { boolean ok = false; - try { - - DatagramSocket socket = new DatagramSocket(); - if(socket!=null) - { - socket.setBroadcast(true); - InetAddress broadcastIPAddress = getBroadcastAddress(); - if(filter) { msg = senderId+msg; } - byte[] bytes = msg.getBytes(); - DatagramPacket packet = new DatagramPacket(bytes,bytes.length, broadcastIPAddress , broadcastPort); - socket.send(packet); - socket.close(); - ok = true; - } - else { synchronized(messages) { messages.add("error: socket creation failed for "+msg); }} - } - catch (IOException e) - { if(!exitRequest) { synchronized (messages) { messages.add("error: udp on send "+e); }} - } - return(ok); - } - - /** - * receive broadcast messages on a specfied port, put them - * in a queue to be retrieved by some other process. - * - * @param broadcastPort - */ - public void runBroadcastReceiver(int broadcastPort,boolean fil) - { - try { - filter = fil; - exitRequest = false; - DatagramSocket socket = new DatagramSocket(broadcastPort, InetAddress.getByName("0.0.0.0")); - if(socket!=null) - { - socket.setBroadcast(true); - while(!exitRequest) - { - DatagramPacket packet = new DatagramPacket(new byte[1000], 1000); - socket.receive(packet); - - InetAddress ip = packet.getAddress(); - String host = ip.getHostAddress(); - String msg = new String(packet.getData(), packet.getOffset(), packet.getLength()); - if(filter && msg.charAt(0)=='S') - { if(!msg.startsWith(senderId)) - { - int dx = msg.indexOf(':'); - if(dx>0) { msg = msg.substring(dx+1); } - } - else { msg = null; } - } - if(msg!=null) - { - synchronized(messages) { messages.add(host+":" + msg); } - synchronized(this) { notifyAll(); } - } - } - socket.close(); - } - } - catch (IOException e) - { - if(!exitRequest) { synchronized(messages) { messages.add("error: on receive "+e); }} - } - } - public void stop() - { exitRequest = true; - } - public boolean isSupported() { - return true; - } -} - - diff --git a/client/boardspace-maven/boardspacedevelop/common/.classpath b/client/boardspace-maven/boardspacedevelop/common/.classpath index d6896d2d4..a4f71a3f8 100644 --- a/client/boardspace-maven/boardspacedevelop/common/.classpath +++ b/client/boardspace-maven/boardspacedevelop/common/.classpath @@ -1,44 +1,17 @@ - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + - - - + diff --git a/client/boardspace-maven/boardspacedevelop/common/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch b/client/boardspace-maven/boardspacedevelop/common/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacedevelop/common/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacedevelop/common/.gitignore b/client/boardspace-maven/boardspacedevelop/common/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacedevelop/common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacedevelop/common/.project b/client/boardspace-maven/boardspacedevelop/common/.project index 7255d8033..51a428f8e 100644 --- a/client/boardspace-maven/boardspacedevelop/common/.project +++ b/client/boardspace-maven/boardspacedevelop/common/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch + @@ -24,22 +29,22 @@ boardspace core 2 - F:/github/boardspace.net/client/boardspace-codename1/boardspace core + G:/share/projects/boardspace-codename1/boardspace core boardspace games 2 - F:/github/boardspace.net/client/boardspace-codename1/boardspace games + G:/share/projects/boardspace-codename1/boardspace games codename1 2 - F:/github/boardspace.net/client/boardspace-codename1/codename1 + G:/share/projects/boardspace-codename1/codename1 - 1643340519813 + 1701368684575 22 @@ -47,5 +52,59 @@ 1.0-name-matches-false-false-*.bak + + 1701368684582 + + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-cvs + + + + 1701368795627 + boardspace core + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-cvs + + + + 1701368795630 + boardspace core + 6 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.bak + + + + 1701368893427 + boardspace games + 6 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.bak + + + + 1701368893430 + boardspace games + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-cvs + + + + 1701851956559 + src + 14 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-* + + diff --git a/client/boardspace-maven/boardspacedevelop/common/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacedevelop/common/.settings/org.eclipse.core.resources.prefs index 839d647ee..99f26c020 100644 --- a/client/boardspace-maven/boardspacedevelop/common/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacedevelop/common/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacedevelop/common/codenameone_settings.properties b/client/boardspace-maven/boardspacedevelop/common/codenameone_settings.properties index 1e878e235..1d89bc2ff 100644 --- a/client/boardspace-maven/boardspacedevelop/common/codenameone_settings.properties +++ b/client/boardspace-maven/boardspacedevelop/common/codenameone_settings.properties @@ -1,5 +1,3 @@ -# -#Fri Oct 27 11:25:05 PDT 2023 baseClass=src/generated/StateMachineBase.java codename1.android.keystore=G\:\\share\\projects\\ios-certificates\\androidstore.ks codename1.android.keystoreAlias=android @@ -20,7 +18,7 @@ codename1.arg.ios.entitlements.multicast=true codename1.arg.ios.fastbuild=false codename1.arg.ios.fileSharingEnabled=true codename1.arg.ios.includeNullChecks=true -codename1.arg.ios.includePush=true +codename1.arg.ios.includePush=false codename1.arg.ios.interface_orientation=UIInterfaceOrientationPortrait\:UIInterfaceOrientationPortraitUpsideDown\:UIInterfaceOrientationLandscapeLeft\:UIInterfaceOrientationLandscapeRight codename1.arg.ios.multitasking=true codename1.arg.ios.objC=true @@ -30,29 +28,29 @@ codename1.arg.ios.testFlight=true codename1.arg.ios.zsign=true codename1.arg.java.version=8 codename1.displayName=boardspace -codename1.icon=G\:\\share\\projects\\boardspace-codename1\\icons\\boardspace-devel-icon-512x512.png -codename1.ios.appid=N9ZJLP5456.dev.boardspace +codename1.icon=G\:\\share\\projects\\boardspace-codename1\\icons\\boardspace-devel-maven-512x512.png +codename1.ios.appid=N9ZJLP5456.maven.boardspace codename1.ios.certificate= codename1.ios.certificatePassword= -codename1.ios.debug.certificate=G\:\\share\\projects\\eclipse\\boardspace-cn2\\iosCerts\\development_certificate.p12 +codename1.ios.debug.certificate=G\:\\share\\projects\\boardspace-maven\\boardspacedevelop\\common\\iosCerts\\development_certificate.p12 codename1.ios.debug.certificatePassword=G51uJi3G -codename1.ios.debug.notificationServiceExtensionProvision=G\:\\share\\projects\\eclipse\\boardspace-cn2\\iosCerts\\development_notification_service_extension_provisioning_profile.mobileprovision -codename1.ios.debug.provision=G\:\\share\\projects\\eclipse\\boardspace-cn2\\iosCerts\\development_provisioning_profile.mobileprovision +codename1.ios.debug.notificationServiceExtensionProvision=G\:\\share\\projects\\boardspace-maven\\boardspacedevelop\\common\\iosCerts\\development_notification_service_extension_provisioning_profile.mobileprovision +codename1.ios.debug.provision=G\:\\share\\projects\\boardspace-maven\\boardspacedevelop\\common\\iosCerts\\development_provisioning_profile.mobileprovision codename1.ios.provision= -codename1.ios.release.certificate=G\:\\share\\projects\\eclipse\\boardspace-cn2\\iosCerts\\appstore_certificate.p12 +codename1.ios.release.certificate=G\:\\share\\projects\\boardspace-maven\\boardspacedevelop\\common\\iosCerts\\appstore_certificate.p12 codename1.ios.release.certificatePassword=ItmhG0i2 -codename1.ios.release.notificationServiceExtensionProvision=G\:\\share\\projects\\eclipse\\boardspace-cn2\\iosCerts\\production_notification_service_extension_provisioning_profile.mobileprovision -codename1.ios.release.provision=G\:\\share\\projects\\eclipse\\boardspace-cn2\\iosCerts\\production_provisioning_profile.mobileprovision +codename1.ios.release.notificationServiceExtensionProvision=G\:\\share\\projects\\boardspace-maven\\boardspacedevelop\\common\\iosCerts\\production_notification_service_extension_provisioning_profile.mobileprovision +codename1.ios.release.provision=G\:\\share\\projects\\boardspace-maven\\boardspacedevelop\\common\\iosCerts\\production_provisioning_profile.mobileprovision codename1.j2me.nativeTheme=nativej2me.res codename1.languageLevel=5 codename1.mainName=Develop -codename1.packageName=dev.boardspace +codename1.packageName=maven.boardspace codename1.rim.certificatePassword= codename1.rim.signtoolCsk= codename1.rim.signtoolDb= codename1.secondaryTitle=boardspace codename1.vendor=CodenameOne -codename1.version=16.97 +codename1.version=27.66 guiResource=theme.res libVersion=211 package=generated diff --git a/client/boardspace-maven/boardspacedevelop/common/icon.png b/client/boardspace-maven/boardspacedevelop/common/icon.png index 1f4fa5dd2..701a468a0 100644 Binary files a/client/boardspace-maven/boardspacedevelop/common/icon.png and b/client/boardspace-maven/boardspacedevelop/common/icon.png differ diff --git a/client/boardspace-maven/boardspacedevelop/common/iosCerts/appstore_certificate.p12 b/client/boardspace-maven/boardspacedevelop/common/iosCerts/appstore_certificate.p12 new file mode 100644 index 000000000..460bab54c Binary files /dev/null and b/client/boardspace-maven/boardspacedevelop/common/iosCerts/appstore_certificate.p12 differ diff --git a/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_certificate.p12 b/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_certificate.p12 new file mode 100644 index 000000000..c39b39a54 Binary files /dev/null and b/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_certificate.p12 differ diff --git a/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_notification_service_extension_provisioning_profile.mobileprovision b/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_notification_service_extension_provisioning_profile.mobileprovision new file mode 100644 index 000000000..50b37f508 Binary files /dev/null and b/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_notification_service_extension_provisioning_profile.mobileprovision differ diff --git a/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_provisioning_profile.mobileprovision b/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_provisioning_profile.mobileprovision new file mode 100644 index 000000000..d10217240 Binary files /dev/null and b/client/boardspace-maven/boardspacedevelop/common/iosCerts/development_provisioning_profile.mobileprovision differ diff --git a/client/boardspace-maven/boardspacedevelop/common/iosCerts/production_notification_service_extension_provisioning_profile.mobileprovision b/client/boardspace-maven/boardspacedevelop/common/iosCerts/production_notification_service_extension_provisioning_profile.mobileprovision new file mode 100644 index 000000000..ef8f9f4a9 Binary files /dev/null and b/client/boardspace-maven/boardspacedevelop/common/iosCerts/production_notification_service_extension_provisioning_profile.mobileprovision differ diff --git a/client/boardspace-maven/boardspacedevelop/common/iosCerts/production_provisioning_profile.mobileprovision b/client/boardspace-maven/boardspacedevelop/common/iosCerts/production_provisioning_profile.mobileprovision new file mode 100644 index 000000000..d4c47d9ed Binary files /dev/null and b/client/boardspace-maven/boardspacedevelop/common/iosCerts/production_provisioning_profile.mobileprovision differ diff --git a/client/boardspace-maven/boardspacedevelop/common/pom.xml b/client/boardspace-maven/boardspacedevelop/common/pom.xml index e057b8c59..1f7f48d74 100644 --- a/client/boardspace-maven/boardspacedevelop/common/pom.xml +++ b/client/boardspace-maven/boardspacedevelop/common/pom.xml @@ -1,6 +1,9 @@ + + 4.0.0 + dev.boardspace boardspacedevelop @@ -11,6 +14,7 @@ 1.0-SNAPSHOT jar + @@ -32,6 +36,7 @@ ${user.home}/.codenameone/guibuilder.jar + org.apache.maven.plugins maven-antrun-plugin @@ -178,6 +183,7 @@ + org.codehaus.mojo exec-maven-plugin @@ -302,12 +308,114 @@ + + + + + g:/share/projects/boardspace-maven/boardspacedevelop/common/src/main/java/ + + **/*.res + + + + + + maven-resources-plugin + 2.7 + + + + copy-respources + generate-sources + + copy-resources + + + src/main/java/ + + + ../../../boardspace-codename1/codename1/ + **/*.java + **/*.res + + + ../../../boardspace-codename1/boardspace core/ + **/*.java + **/*.res + + + ../../../boardspace-codename1/boardspace games/ + **/*.java + **/*.res + + + + + + + + + + maven-clean-plugin + + + + + src + + + + + + + org.apache.maven.plugins maven-compiler-plugin + - 1.8 + 1.8 1.8 @@ -342,7 +450,8 @@ generate-gui-sources - + + cn1-process-classes process-classes @@ -351,6 +460,8 @@ + + attach-test-artifact test diff --git a/client/boardspace-maven/boardspacedevelop/common/src/test/java/dev/boardspace/MyFirstTest.java b/client/boardspace-maven/boardspacedevelop/common/src/test/java/dev/boardspace/MyFirstTest.java deleted file mode 100644 index b5f9efe39..000000000 --- a/client/boardspace-maven/boardspacedevelop/common/src/test/java/dev/boardspace/MyFirstTest.java +++ /dev/null @@ -1,23 +0,0 @@ - -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package dev.boardspace; - -import com.codename1.testing.AbstractTest; - -/** - * - * @author shannah - */ -public class MyFirstTest extends AbstractTest { - - @Override - public boolean runTest() throws Exception { - return true; - } - - -} diff --git a/client/boardspace-maven/boardspacedevelop/ios/.classpath b/client/boardspace-maven/boardspacedevelop/ios/.classpath index ec8625fe9..377b5ab83 100644 --- a/client/boardspace-maven/boardspacedevelop/ios/.classpath +++ b/client/boardspace-maven/boardspacedevelop/ios/.classpath @@ -1,31 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -35,12 +10,5 @@ - - - - - - - - + diff --git a/client/boardspace-maven/boardspacedevelop/ios/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (2).launch b/client/boardspace-maven/boardspacedevelop/ios/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (2).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacedevelop/ios/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (2).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacedevelop/ios/.gitignore b/client/boardspace-maven/boardspacedevelop/ios/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacedevelop/ios/.project b/client/boardspace-maven/boardspacedevelop/ios/.project index 28a16796a..885c786c3 100644 --- a/client/boardspace-maven/boardspacedevelop/ios/.project +++ b/client/boardspace-maven/boardspacedevelop/ios/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (2).launch + @@ -20,6 +25,13 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + ios + 2 + G:/share/projects/boardspace-codename1/native/ios + + 1643340599397 diff --git a/client/boardspace-maven/boardspacedevelop/ios/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacedevelop/ios/.settings/org.eclipse.core.resources.prefs index 5c8f7c95f..99f26c020 100644 --- a/client/boardspace-maven/boardspacedevelop/ios/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacedevelop/ios/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/objectivec=UTF-8 -encoding//src/main/resources=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacedevelop/ios/pom.xml b/client/boardspace-maven/boardspacedevelop/ios/pom.xml index d54c33ff0..a7c56e21c 100644 --- a/client/boardspace-maven/boardspacedevelop/ios/pom.xml +++ b/client/boardspace-maven/boardspacedevelop/ios/pom.xml @@ -23,7 +23,7 @@ - src/main/objectivec + ../../../boardspace-codename1/native/ios/ src/main/resources diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries deleted file mode 100644 index 240cb9c49..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries +++ /dev/null @@ -1,9 +0,0 @@ -/bridge_NativeServerSocketImpl.h/1.1/Fri Nov 30 16:53:51 2018// -/bridge_NativeServerSocketImpl.m/1.1/Fri Nov 30 16:53:51 2018// -/bridge_SystemTimeImpl.h/1.1/Wed Jun 3 17:56:10 2020// -/bridge_SystemTimeImpl.m/1.1/Fri Jun 5 00:21:16 2020// -/bridge_InstallerPackageImpl.h/1.4/Sat Jun 19 18:45:38 2021// -/bridge_InstallerPackageImpl.m/1.4/Sat Jun 19 18:46:24 2021// -/udp_UdpListenerImpl.h/1.2/Wed Dec 8 18:05:42 2021// -/udp_UdpListenerImpl.m/1.4/Wed Dec 8 18:05:05 2021// -D diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Extra b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Extra deleted file mode 100644 index df97f4a6f..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Extra +++ /dev/null @@ -1,8 +0,0 @@ -/bridge_NativeServerSocketImpl.h///1591200849//// -/bridge_NativeServerSocketImpl.m///1591200849//// -/bridge_SystemTimeImpl.h///1598217866//// -/bridge_SystemTimeImpl.m///1598217866//// -/bridge_InstallerPackageImpl.h///1638987812//// -/bridge_InstallerPackageImpl.m///1638987812//// -/udp_UdpListenerImpl.h///1638987865//// -/udp_UdpListenerImpl.m///1638987865//// diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Extra.Old deleted file mode 100644 index 82f073fd6..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Extra.Old +++ /dev/null @@ -1,8 +0,0 @@ -/bridge_NativeServerSocketImpl.h///1591200849//// -/bridge_NativeServerSocketImpl.m///1591200849//// -/bridge_SystemTimeImpl.h///1598217866//// -/bridge_SystemTimeImpl.m///1598217866//// -/bridge_InstallerPackageImpl.h///1638987812//// -/bridge_InstallerPackageImpl.m///1638987812//// -/udp_UdpListenerImpl.h///1540947592//// -/udp_UdpListenerImpl.m///1563235133//// diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Old b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Old deleted file mode 100644 index ab7c48312..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Entries.Old +++ /dev/null @@ -1,9 +0,0 @@ -/bridge_NativeServerSocketImpl.h/1.1/Fri Nov 30 16:53:51 2018// -/bridge_NativeServerSocketImpl.m/1.1/Fri Nov 30 16:53:51 2018// -/bridge_SystemTimeImpl.h/1.1/Wed Jun 3 17:56:10 2020// -/bridge_SystemTimeImpl.m/1.1/Fri Jun 5 00:21:16 2020// -/bridge_InstallerPackageImpl.h/1.4/Sat Jun 19 18:45:38 2021// -/bridge_InstallerPackageImpl.m/1.4/Sat Jun 19 18:46:24 2021// -/udp_UdpListenerImpl.h/1.1/Wed Oct 31 00:59:52 2018// -/udp_UdpListenerImpl.m/1.3/Mon Jul 15 23:58:53 2019// -D diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Repository b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Repository deleted file mode 100644 index 198015f58..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/ios diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_InstallerPackageImpl.h b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_InstallerPackageImpl.h deleted file mode 100644 index c223325a5..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_InstallerPackageImpl.h +++ /dev/null @@ -1,16 +0,0 @@ -#import - -@interface bridge_InstallerPackageImpl : NSObject { -} - --(NSString*)getPackages; --(NSString*)getOSInfo; --(NSString*)getHostName; --(int)getOrientation; --(int)setOrientation:(BOOL)param param1:(BOOL)param1; --(NSString*)getInstaller:(NSString*)param; --(NSString*)getLocalWifiIpAddress; --(double)getScreenDPI; --(BOOL)isSupported; --(void)hardExit; -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_InstallerPackageImpl.m b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_InstallerPackageImpl.m deleted file mode 100644 index 8b9ee0de7..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_InstallerPackageImpl.m +++ /dev/null @@ -1,46 +0,0 @@ -#import "bridge_InstallerPackageImpl.h" - -@implementation bridge_InstallerPackageImpl - --(NSString*)eval:(NSString*)param{ - return nil; -} - --(NSString*)getPackages{ - return nil; -} - --(NSString*)getOSInfo{ - return nil; -} - --(NSString*)getHostName{ - return nil; -} - --(int)getOrientation{ - return 0; -} --(double)getScreenDPI{ - return(96.0); -} - --(int)setOrientation:(BOOL)param param1:(BOOL)param1{ - return 0; -} - --(NSString*)getInstaller:(NSString*)param{ - return nil; -} - --(NSString*)getLocalWifiIpAddress{ - return nil; -} --(void)hardExit { -} - --(BOOL)isSupported{ - return NO; -} - -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_NativeServerSocketImpl.h b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_NativeServerSocketImpl.h deleted file mode 100644 index 00b4db6cc..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_NativeServerSocketImpl.h +++ /dev/null @@ -1,22 +0,0 @@ -#import - -@interface bridge_NativeServerSocketImpl : NSObject { -} - --(int)write:(int)param param1:(int)param1; --(int)connect:(NSString*)param param1:(int)param1; --(int)listen; --(int)read:(int)param; --(int)flush:(int)param; --(int)writeArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3; --(int)readArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3; --(int)closeSocket:(int)param; --(NSString*)getIOExceptionMessage:(int)param; --(int)bindSocket:(int)param; --(int)closeOutput:(int)param; --(int)unBind; --(int)getOutputHandle:(int)param; --(int)closeInput:(int)param; --(int)getInputHandle:(int)param; --(BOOL)isSupported; -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_NativeServerSocketImpl.m b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_NativeServerSocketImpl.m deleted file mode 100644 index 2f759b9fe..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_NativeServerSocketImpl.m +++ /dev/null @@ -1,69 +0,0 @@ -#import "bridge_NativeServerSocketImpl.h" - -@implementation bridge_NativeServerSocketImpl - --(int)write:(int)param param1:(int)param1{ - return 0; -} - --(int)connect:(NSString*)param param1:(int)param1{ - return 0; -} - --(int)listen{ - return 0; -} - --(int)read:(int)param{ - return 0; -} - --(int)flush:(int)param{ - return 0; -} - --(int)writeArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3{ - return 0; -} - --(int)readArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3{ - return 0; -} - --(int)closeSocket:(int)param{ - return 0; -} - --(NSString*)getIOExceptionMessage:(int)param{ - return nil; -} - --(int)bindSocket:(int)param{ - return 0; -} - --(int)closeOutput:(int)param{ - return 0; -} - --(int)unBind{ - return 0; -} - --(int)getOutputHandle:(int)param{ - return 0; -} - --(int)closeInput:(int)param{ - return 0; -} - --(int)getInputHandle:(int)param{ - return 0; -} - --(BOOL)isSupported{ - return NO; -} - -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_SystemTimeImpl.h b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_SystemTimeImpl.h deleted file mode 100644 index 54472e1a1..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_SystemTimeImpl.h +++ /dev/null @@ -1,8 +0,0 @@ -#import - -@interface bridge_SystemTimeImpl : NSObject { -} - --(long long)currentNanoTime; --(BOOL)isSupported; -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_SystemTimeImpl.m b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_SystemTimeImpl.m deleted file mode 100644 index e59dcefff..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/bridge_SystemTimeImpl.m +++ /dev/null @@ -1,21 +0,0 @@ -#import "bridge_SystemTimeImpl.h" -#include - -@implementation bridge_SystemTimeImpl - --(long long)currentNanoTime{ - uint64_t mach_time = mach_absolute_time(); - static mach_timebase_info_data_t _clock_timebase; - if(_clock_timebase.denom == 0 ) - { - mach_timebase_info(&_clock_timebase); // Initialize timebase_info - } - double nanos = (mach_time * _clock_timebase.numer) / _clock_timebase.denom; - return((long long)nanos); -} - - --(BOOL)isSupported{ - return YES; -} -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/udp_UdpListenerImpl.h b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/udp_UdpListenerImpl.h deleted file mode 100644 index 3ad9fb29a..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/udp_UdpListenerImpl.h +++ /dev/null @@ -1,11 +0,0 @@ -#import - -@interface udp_UdpListenerImpl : NSObject { -} - --(NSString*)getMessage:(int)param; --(void)stop; --(BOOL)sendMessage:(NSString*)param param1:(int)param1; --(void)runBroadcastReceiver:(int)param param1:(BOOL)param1; --(BOOL)isSupported; -@end diff --git a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/udp_UdpListenerImpl.m b/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/udp_UdpListenerImpl.m deleted file mode 100644 index 28c6f3336..000000000 --- a/client/boardspace-maven/boardspacedevelop/ios/src/main/objectivec/udp_UdpListenerImpl.m +++ /dev/null @@ -1,174 +0,0 @@ -#import "udp_UdpListenerImpl.h" - -@implementation udp_UdpListenerImpl - - #include - #include - #include - #include - #include - #include - #define BUFLEN 512 - -NSMutableArray* messages ; -BOOL exitRequest = false; -int sockn = -1; -BOOL filter = false; -char senderId[50]; -dispatch_semaphore_t waiting; - -// codename1 magic to make the garbage collector happy while we wait -static void _yield() { - CN1_YIELD_THREAD; -} - -static void _resume() { - CN1_RESUME_THREAD; -} -// get something and/or wait --(NSString*)getMessage:(int)waitTime -{ NSString *m=nil; - if(!exitRequest) - { - if((waitTime>=0) && ([messages count]==0)) - { - _yield(); // codename1 magic to mark an inactive thread - dispatch_time_t timeout = (waitTime==0) - ? DISPATCH_TIME_FOREVER - : (DISPATCH_TIME_NOW + (waitTime * (NSEC_PER_SEC/1000))); - dispatch_semaphore_wait(waiting, timeout); - _resume(); - } - @synchronized (self) - { - if([messages count]!=0) { m = messages[0]; [messages removeObjectAtIndex:0]; } - } - } - return(m); -} -// add a message to the queue --(void)addObject : (NSString *)m -{ @synchronized(self) - { - [messages addObject:m]; - dispatch_semaphore_signal(waiting); - } -} - --(id)init -{ messages = [[NSMutableArray alloc] init]; - sprintf(senderId,"S%ld:",arc4random()&0x7fffffffffffffff); - waiting = dispatch_semaphore_create(0); - sockn = -1; - return(self); -} - - --(void)stop{ - exitRequest = true; - if(sockn>=0) { close(sockn); } - dispatch_semaphore_signal(waiting); - sockn=-1; -} - --(BOOL)sendMessage:(NSString*)msg param1:(int)port - { - BOOL ok = false; - //unsigned int wifiInterface = if_nametoindex("en0"); - struct sockaddr_in si_other; - int s, i; - unsigned int slen=sizeof(si_other); - char buf[BUFLEN]; - if ((s=socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP))<0) - {[self addObject : @"error:socket creation failed"]; - return(ok); - } - - static const int kOne = 1; - int success1 = setsockopt(s, SOL_SOCKET, SO_BROADCAST, &kOne, sizeof(kOne)) == 0; - if(!success1) { [self addObject : @"error:set broadcast failed"]; return(ok); } - - memset((char *) &si_other, 0, slen); - si_other.sin_family = AF_INET; - si_other.sin_len = slen; - si_other.sin_addr.s_addr = INADDR_BROADCAST; - si_other.sin_port = htons(port); - - sprintf(buf, "%s%s",(filter?senderId:""),[msg UTF8String]); - if (sendto(s, buf, strlen(buf), 0, (struct sockaddr *)&si_other, slen)<0) - { [self addObject : @"error:sendto failed"]; - return(ok); - } - close(s); - ok = true; - return(ok); -} - -// bind the receiver and run the listen loop --(void)runBroadcastReceiver:(int)port param1:(BOOL)fil -{ - struct sockaddr_in si_me; - int i; - static const int kOne = 1; - unsigned int slen=sizeof(si_me); - filter = fil; - exitRequest = false; - if ((sockn=socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP))<0) - { [self addObject:@"error: create socket failed"]; - return; - - } - - memset((char *) &si_me, 0, sizeof(si_me)); - si_me.sin_family = AF_INET; - si_me.sin_port = htons(port); - si_me.sin_addr.s_addr = htonl(INADDR_ANY); - si_me.sin_len = slen; - - if (bind(sockn, (struct sockaddr *)&si_me, sizeof(si_me))<0) - {[self addObject:@"error: sock bind failed"]; - return; - } - - do { [self broadcastRecv] ; } while (!exitRequest); - } - // receive a message - -(BOOL)broadcastRecv - { - if(sockn>=0) - { struct sockaddr_in si_other; - unsigned int slen = sizeof(si_other); - char buf[BUFLEN]; - _yield(); // codename1 magic to mark an inactive thread - ssize_t siz = recvfrom(sockn, buf, BUFLEN, 0, (struct sockaddr *)&si_other, &slen); - _resume(); - if(siz>=0) - { - char str[INET_ADDRSTRLEN]; - buf[siz]=(char)0; - inet_ntop(AF_INET,&si_other.sin_addr,str,INET_ADDRSTRLEN); - char *idx = buf; - if(filter && buf[0]=='S') - { if(strcmp(buf,senderId)!=0) - { - idx = index(buf,':'); - if(idx==nil) { idx = buf; } else { idx++; } - } - else { idx = nil; } - } - if(idx!=nil) - { - NSString *recv = [NSString stringWithFormat:@"%s:%s",str,idx]; - [self addObject: recv]; - return(YES); - } - }} - return(NO); -} - --(BOOL)isSupported -{ - return YES; -} - -@end diff --git a/client/boardspace-maven/boardspacedevelop/javascript/.classpath b/client/boardspace-maven/boardspacedevelop/javascript/.classpath index acf707c54..4ee88a6f5 100644 --- a/client/boardspace-maven/boardspacedevelop/javascript/.classpath +++ b/client/boardspace-maven/boardspacedevelop/javascript/.classpath @@ -9,13 +9,11 @@ - - @@ -25,7 +23,7 @@ - + @@ -35,12 +33,5 @@ - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/javascript/.gitignore b/client/boardspace-maven/boardspacedevelop/javascript/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacedevelop/javascript/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacedevelop/javase/.classpath b/client/boardspace-maven/boardspacedevelop/javase/.classpath index a138ec619..eea0c836e 100644 --- a/client/boardspace-maven/boardspacedevelop/javase/.classpath +++ b/client/boardspace-maven/boardspacedevelop/javase/.classpath @@ -12,14 +12,8 @@ - - - - - - - - + + @@ -29,12 +23,5 @@ - - - - - - - - + diff --git a/client/boardspace-maven/boardspacedevelop/javase/.gitignore b/client/boardspace-maven/boardspacedevelop/javase/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacedevelop/javase/.project b/client/boardspace-maven/boardspacedevelop/javase/.project index 0caedc483..a4cc16cdc 100644 --- a/client/boardspace-maven/boardspacedevelop/javase/.project +++ b/client/boardspace-maven/boardspacedevelop/javase/.project @@ -20,4 +20,11 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + javase + 2 + G:/share/projects/boardspace-codename1/native/javase + + diff --git a/client/boardspace-maven/boardspacedevelop/javase/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacedevelop/javase/.settings/org.eclipse.core.resources.prefs index abdea9ac0..99f26c020 100644 --- a/client/boardspace-maven/boardspacedevelop/javase/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacedevelop/javase/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/desktop/java/dev/boardspace/BoardspaceDevelopStub.java b/client/boardspace-maven/boardspacedevelop/javase/src/desktop/java/dev/boardspace/BoardspaceDevelopStub.java deleted file mode 100644 index 644eec73e..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/desktop/java/dev/boardspace/BoardspaceDevelopStub.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (c) 2012, Codename One and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Codename One designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Codename One through http://www.codenameone.com/ if you - * need additional information or have any questions. - */ - -package dev.boardspace; - -import com.codename1.impl.javase.JavaSEPort; -import com.codename1.ui.Display; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.awt.Toolkit; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; -import java.io.File; -import java.util.Arrays; -import javax.swing.ImageIcon; -import javax.swing.JFrame; -import javax.swing.SwingUtilities; - -/** - * A wrapper class around a Codename One app, allows building desktop Java - * applications. - * - * @author Shai Almog - */ -public class BoardspaceDevelopStub implements Runnable, WindowListener { - private static final String APP_TITLE = "Hi World"; - private static final String APP_NAME = "BoardspaceDevelop"; - private static final String APP_VERSION = "1.0"; - private static final int APP_WIDTH = 800; - private static final int APP_HEIGHT = 600; - private static final boolean APP_ADAPT_TO_RETINA = true; - private static final boolean APP_RESIZEABLE = true; - private static final boolean APP_FULLSCREEN = false; - public static final String BUILD_KEY = ""; - public static final String PACKAGE_NAME = ""; - public static final String BUILT_BY_USER = ""; - private static final boolean isWindows; - static { - isWindows = File.separatorChar == '\\'; - } - - private static final String[] fontFaces = null; - - private static JFrame frm; - private BoardspaceDevelop mainApp; - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - try { - Class.forName("org.cef.CefApp"); - System.setProperty("cn1.javase.implementation", "cef"); - //System.setProperty("cn1.cef.bundled", "true"); - } catch (Throwable ex){} - - JavaSEPort.setNativeTheme("/NativeTheme.res"); - JavaSEPort.blockMonitors(); - JavaSEPort.setAppHomeDir("." + APP_NAME); - JavaSEPort.setExposeFilesystem(true); - JavaSEPort.setTablet(true); - JavaSEPort.setUseNativeInput(true); - JavaSEPort.setShowEDTViolationStacks(false); - JavaSEPort.setShowEDTWarnings(false); - JavaSEPort.setFullScreen(APP_FULLSCREEN); - - if(fontFaces != null) { - JavaSEPort.setFontFaces(fontFaces[0], fontFaces[1], fontFaces[2]); - } else { - // workaround for a bug in Windows where Arials unicode version isn't used - if(isWindows) { - JavaSEPort.setFontFaces("ArialUnicodeMS", "SansSerif", "Monospaced"); - } else { - JavaSEPort.setFontFaces("Arial", "SansSerif", "Monospaced"); - } - } - - - frm = new JFrame(APP_TITLE); - Toolkit tk = Toolkit.getDefaultToolkit(); - JavaSEPort.setDefaultPixelMilliRatio(tk.getScreenResolution() / 25.4 * JavaSEPort.getRetinaScale()); - Display.init(frm.getContentPane()); - Display.getInstance().setProperty("build_key", BUILD_KEY); - Display.getInstance().setProperty("package_name", PACKAGE_NAME); - Display.getInstance().setProperty("built_by_user", BUILT_BY_USER); - //placeholder - Display.getInstance().setProperty("AppName", APP_NAME); - Display.getInstance().setProperty("AppVersion", APP_VERSION); - Display.getInstance().setProperty("Platform", System.getProperty("os.name")); - Display.getInstance().setProperty("OSVer", System.getProperty("os.version")); - - SwingUtilities.invokeLater(new BoardspaceDevelopStub()); - } - - public void run() { - frm.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - frm.addWindowListener(this); - ImageIcon ic16 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic20 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic32 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic40 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic64 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - frm.setIconImages(Arrays.asList(ic16.getImage(), ic20.getImage(), ic32.getImage(), ic40.getImage(), ic64.getImage())); - GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - if(APP_FULLSCREEN && gd.isFullScreenSupported()) { - frm.setResizable(false); - frm.setUndecorated(true); - gd.setFullScreenWindow(frm); - - } else { - frm.setLocationByPlatform(true); - frm.setResizable(APP_RESIZEABLE); - int w = APP_WIDTH; - int h = APP_HEIGHT; - - frm.getContentPane().setPreferredSize(new java.awt.Dimension(w, h)); - frm.getContentPane().setMinimumSize(new java.awt.Dimension(w, h)); - frm.getContentPane().setMaximumSize(new java.awt.Dimension(w, h)); - - // replaceable with the build hint desktop.framePrepare - framePrepare(frm); - } - Display.getInstance().callSerially(new Runnable() { - @Override - public void run() { - if(Display.getInstance().isEdt()) { - mainApp = new BoardspaceDevelop(); - mainApp.init(this); - mainApp.start(); - SwingUtilities.invokeLater(this); - } else { - - // replaceable with the build hint desktop.frameShow - frameShow(frm); - } - } - }); - } - - private void framePrepare(JFrame frm) { - frm.pack(); - } - - private void frameShow(JFrame frm) { - frm.setVisible(true); - } - - @Override - public void windowOpened(WindowEvent e) { - } - - @Override - public void windowClosing(WindowEvent e) { - Display.getInstance().callSerially(new Runnable() { - @Override - public void run() { - mainApp.stop(); - mainApp.destroy(); - Display.getInstance().exitApplication(); - } - }); - } - - @Override - public void windowClosed(WindowEvent e) { - } - - @Override - public void windowIconified(WindowEvent e) { - } - - @Override - public void windowDeiconified(WindowEvent e) { - } - - @Override - public void windowActivated(WindowEvent e) { - } - - @Override - public void windowDeactivated(WindowEvent e) { - // fix for https://stackoverflow.com/questions/6178132/fullscreen-java-app-minimizes-when-screensaver-turns-on - if(APP_FULLSCREEN) { - GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - frm.setExtendedState(JFrame.MAXIMIZED_BOTH); - if(gd.isFullScreenSupported()) { - frm.setResizable(false); - frm.setUndecorated(true); - gd.setFullScreenWindow(frm); - } - } - } -} diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/desktop/resources/NativeTheme.res b/client/boardspace-maven/boardspacedevelop/javase/src/desktop/resources/NativeTheme.res deleted file mode 100644 index 83e067b69..000000000 Binary files a/client/boardspace-maven/boardspacedevelop/javase/src/desktop/resources/NativeTheme.res and /dev/null differ diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/CVS/Root b/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/InstallerPackageImpl.java b/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/InstallerPackageImpl.java deleted file mode 100644 index 6f7d2cf91..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/InstallerPackageImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import java.net.InetAddress; -import java.lang.Throwable; - -public class InstallerPackageImpl implements InstallerPackage -{ - public String getPackages() { - return null; - } - - public void setDrawers(boolean vis) - { - } - public String eval(String command) - { - - return "ok"; - } - - - public String getInstaller(String param) { - return null; - } - public String getHostName() - { try { - return(InetAddress.getLocalHost().getHostName()); - } catch (Throwable e) {}; - return(null); - } - - public boolean isSupported() { - return true; - } - public double getScreenDPI() { return(96.0); } - public String getOSInfo() { return("simulator"); } - public int getOrientation() { return(0); } - public int setOrientation(boolean portrait,boolean rev) { return(0); } - public String getLocalWifiIpAddress() { return("localhost"); } - public void hardExit() { - System.exit(0); - } -} diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/NativeServerSocketImpl.java b/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/NativeServerSocketImpl.java deleted file mode 100644 index 3e86e557c..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/NativeServerSocketImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import java.lang.Exception; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.util.Hashtable; -import java.net.ServerSocket; -/** - * this javase version of NativeServerSocket is essentially - * identical to the JavaSE version, which is in turn essentially - * identical to the plain java version. - * - * This implements server socket binding and an "accept" factory - * the key to it's success is that it also implements the raw I/O - * on the socket streams that the factory produces. - * - * @author Ddyer - * - */ -public class NativeServerSocketImpl implements bridge.NativeServerSocket -{ // - // native interfaces are restructed from returning objects, so instead - // it returns integers which act as handles for the underlying objects. - // - private HashtableobjectMap = new Hashtable(); - private HashtablereverseMap = new Hashtable(); - private int nextKey = 1000; - private Object find(int key) { return(objectMap.get(key)); } - private void forget(int key) { objectMap.remove(key); } - private int remember(Object something) - { int v = nextKey++; - objectMap.put(v,something); - return(v); - } - private int errorCode(String something) - { if(reverseMap.containsKey(something)) - { return reverseMap.get(something); - } - int v = -remember(something); - reverseMap.put(something, v); - return(v); - } - // - // native interfaces also can't throw errors, so errors are caught - // and their .toString() values are remembered. For general compatibility - // with i/o, values from -1 up are not errors. - // - public String getIOExceptionMessage(int handle) - { return ( (handle>-1) ? null : (String)(find(-handle))); - } - - // service for NativeOutputStream - public int write(int handle, int param1) { - try { - OutputStream o = (OutputStream)find(handle); - o.write(param1); - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int writeArray(int param, byte[] param1, int param2, int param3) - { try { - OutputStream stream = (OutputStream)find(param); - stream.write(param1,param2,param3); - return(0); - } catch (Exception e) - { return(errorCode(e.toString())); - } - } - - /* - * service for NativeInputStream - * - */ - public int read(int param) { - try { - InputStream s = (InputStream)find(param); - int val = s.read(); - return(val); - } - catch (Exception e) { return(errorCode(e.toString())); } - } - public int readArray(int param, byte[] param1, int param2, int param3) - { - try { - InputStream stream = (InputStream)find(param); - int v = stream.read(param1,param2,param3); - return(v); - }catch (Exception e) - { return(errorCode(e.toString())); - } - } - public int closeInput(int param) { - try { - InputStream stream = (InputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int closeSocket(int param) { - try { - Socket sock = (Socket)find(param); - if(sock!=null) { sock.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int closeOutput(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int flush(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.flush(); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - /* - * service for bind and accept - */ - private boolean bound = false; - private ServerSocket serverSocket = null; - public int unBind() - { try { - if(bound) - { - bound = false; - serverSocket.close(); - serverSocket=null; - } - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int bindSocket(int param) - { bound = false; - try { - serverSocket = new ServerSocket(param); - bound = true; - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - public int listen() { - if(bound) - { - try { - Socket listenSocket = serverSocket.accept(); - return(listenSocket==null ? -1 : remember(listenSocket)); - } catch (Exception e) { return(errorCode(e.toString())); } - } - else { return(errorCode("socket not bound")); } - } - - // the listener calls listen, then - // gets these handles and uses them to create - // input and output streams - public int getOutputHandle(int handle) - { try { - { Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) - { - return(remember(listenSocket.getOutputStream())); - } - else { return(errorCode("invalid socket handle")); } - } - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int getInputHandle(int handle) { - try { - Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) { return(remember(listenSocket.getInputStream())); } - else { return(errorCode("invalid socket handle")); } - } - catch (Exception e) { return(errorCode(e.toString())); } - } - - - public boolean isSupported() { - return true; - } - - public int connect(String host, int port) { - try { - @SuppressWarnings("resource") - Socket listenSocket = new Socket(host, port); - if(listenSocket!=null) { return(remember(listenSocket)); } - } catch (Exception err) { errorCode(err.toString()); } - return(-1); - } -} diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/SystemTimeImpl.java b/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/SystemTimeImpl.java deleted file mode 100644 index 354bdcd1c..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/bridge/SystemTimeImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -public class SystemTimeImpl implements bridge.SystemTime{ - public long currentNanoTime() { - return System.nanoTime(); - } - - public boolean isSupported() { - return true; - } - -} diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/udp/CVS/Root b/client/boardspace-maven/boardspacedevelop/javase/src/main/java/udp/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/udp/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/udp/UdpListenerImpl.java b/client/boardspace-maven/boardspacedevelop/javase/src/main/java/udp/UdpListenerImpl.java deleted file mode 100644 index 4ad0fdf31..000000000 --- a/client/boardspace-maven/boardspacedevelop/javase/src/main/java/udp/UdpListenerImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -package udp; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InterfaceAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; -import java.util.Random; -import java.util.Vector; -import lib.Http; - -public class UdpListenerImpl implements udp.UdpListener{ - Vectormessages = new Vector(); - boolean exit=false; - String senderId = "S"+(new Random().nextLong()&0x7fffffffffL)+":"; - boolean filter = false; - public String getMessage(int wait) - { synchronized(this) - { if((wait>=0) && (messages.size()==0)) { try { wait(wait); } catch (InterruptedException e) {} } - } - if(messages.size()>0) { return(messages.remove(0)); } - return(null); - } - - DatagramSocket socket = null; - public VectormyIPAddresses = new Vector(); - public VectormyBroadcastAddresses = new Vector(); - - private void getAllInterfaces() - { - myBroadcastAddresses.clear(); - myIPAddresses.clear(); - - Enumeration interfaces; - try { - interfaces = NetworkInterface.getNetworkInterfaces(); - while (interfaces.hasMoreElements()) - { - NetworkInterface networkInterface = interfaces.nextElement(); - - if (networkInterface.isLoopback() || !networkInterface.isUp()) { - continue; // Don't want to broadcast to the loopback interface - } - - for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses()) { - InetAddress broadcast = interfaceAddress.getBroadcast(); - InetAddress myAddress = interfaceAddress.getAddress(); - if(broadcast!=null) { myBroadcastAddresses.addElement(broadcast.getHostAddress()); } - if(myAddress!=null) { myIPAddresses.addElement(myAddress.getHostAddress()); } - }} - } catch (SocketException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - public void runBroadcastReceiver( int broadcastPort,boolean fil) - { - try { - socket = new DatagramSocket(broadcastPort); - socket.setBroadcast(true); - filter = fil; - while(!exit) - { - DatagramPacket packet = new DatagramPacket(new byte[1000], 1000); - socket.receive(packet); - InetAddress ip = packet.getAddress(); - String host = ip.getHostAddress(); - String msg = new String(packet.getData(), packet.getOffset(), packet.getLength()); - if(filter && msg.charAt(0)=='S') - { if(!msg.startsWith(senderId)) - { - int dx = msg.indexOf(':'); - if(dx>0) { msg = msg.substring(dx+1); } - } - else { msg = null; } - } - if(msg!=null) - { - messages.add(host+":" + msg); - synchronized(this) { notifyAll(); } - } - - } - if(socket!=null) - { - socket.close(); - socket = null; - } - } - catch (IOException e) - { - messages.add("error: on receive: "+e); - - } - } - - private void broadcastOverAllInterfaces(DatagramSocket udpSocket ,String m,int broadcastPort) - throws IOException - { - byte[] msg = m.getBytes(); - - for(int i = 0;i + + 4.0.0 + + dev.boardspace + boardspacedevelop + 1.0-SNAPSHOT + + dev.boardspace + boardspacedevelop-javase + 1.0-SNAPSHOT + + boardspacedevelop-javase + + + UTF-8 + 1.8 + 1.8 + javase + javase + + + ${project.basedir}/../common/src/test/java + + + codenameone-maven-plugin + com.codenameone + ${cn1.plugin.version} + + + add-se-sources + + generate-javase-sources + + generate-sources + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.codenameone + + + codenameone-maven-plugin + + + [7.0.55,) + + + + generate-javase-sources + + + + + + + + + + + + + + + + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + tests + test + + + com.codenameone + codenameone-core + test + + + com.codenameone + codenameone-core + provided + + + com.codenameone + codenameone-javase + test + + + com.codenameone + codenameone-javase + provided + + + + + + + + executable-jar + + javase + dev.boardspace.BoardspaceDevelopStub + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + src/main/resources + src/desktop/resources + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/../common/codenameone_settings.properties + + + + + + + com.codenameone + codenameone-maven-plugin + + + generate-icons + generate-sources + + generate-desktop-app-wrapper + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + + ${project.build.directory}/libs + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + + ${codename1.packageName}.${codename1.mainName}Stub + + + + + + + maven-antrun-plugin + 3.0.0 + + + generate-javase-zip + package + + + + + + + + + + + + + + + + + run + + + + + + + + + + + run-desktop + + javase + dev.boardspace.BoardspaceDevelopStub + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + src/main/resources + src/desktop/resources + + + + com.codenameone + codenameone-maven-plugin + + + generate-icons + generate-sources + + generate-desktop-app-wrapper + + + + + + org.codehaus.mojo + exec-maven-plugin + + + run-desktop + verify + + java + + + + + + + + + + desktop_build + + + codename1.buildTarget + + + + + com.codenameone + codenameone-core + provided + + + com.codenameone + codenameone-javase + provided + + + + + + + com.codenameone + codenameone-maven-plugin + ${cn1.plugin.version} + + + build-desktop-macosx + package + + build + + + + + + + + + + + test + + + !skipTests + + + + javase + com.codename1.impl.javase.Simulator + + + + com.codenameone + codenameone-core + compile + + + + com.codenameone + codenameone-javase + compile + + + + + + com.codenameone + codenameone-maven-plugin + + + + + cn1-tests + test + + test + + + + + + + + + + + + debug-simulator + + javase + com.codename1.impl.javase.Simulator + true + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + + -Xdebug + -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} + -Xmx1024M + -Xmx1024M + + + + + -Dcef.dir=${cef.dir} + + + -Dcodename1.designer.jar=${codename1.designer.jar} + + + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + + + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + + + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + + debug-eclipse + + javase + com.codename1.impl.javase.Simulator + true + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + + -Xdebug + -Xrunjdwp:transport=dt_socket,server=y,address=${jpda.address},suspend=y + -Xmx1024M + -Xmx1024M + + + + + -Dcef.dir=${cef.dir} + + + -Dcodename1.designer.jar=${codename1.designer.jar} + + + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + + + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + + + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + simulator + + javase + com.codename1.impl.javase.Simulator + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + -Xmx1024M + + + -Dcef.dir=${cef.dir} + + + -Dcodename1.designer.jar=${codename1.designer.jar} + + + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + + + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + + + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + idea-simulator + + javase + com.codename1.impl.javase.Simulator + true + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + ${basedir}/../common + + true + + ${codename1.mainClass} + + + + + + cef.dir + ${cef.dir} + + + + codename1.designer.jar + ${codename1.designer.jar} + + + + codename1.css.compiler.args.input + ${codename1.css.compiler.args.input} + + + + codename1.css.compiler.args.output + ${codename1.css.compiler.args.output} + + + + codename1.css.compiler.args.merge + ${codename1.css.compiler.args.merge} + + + + + cn1.class.path + ${cn1.class.path} + + + + + + + + run-in-simulator-idea + verify + + java + + + + + + + + + + + + diff --git a/client/boardspace-maven/boardspacedevelop/javase/target/maven-archiver/pom.properties b/client/boardspace-maven/boardspacedevelop/javase/target/maven-archiver/pom.properties new file mode 100644 index 000000000..f7b901215 --- /dev/null +++ b/client/boardspace-maven/boardspacedevelop/javase/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=boardspacedevelop-javase +groupId=dev.boardspace +version=1.0-SNAPSHOT diff --git a/client/boardspace-maven/boardspacedevelop/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/client/boardspace-maven/boardspacedevelop/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 000000000..32df201d0 --- /dev/null +++ b/client/boardspace-maven/boardspacedevelop/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,4 @@ +udp\UdpListenerImpl.class +bridge\NativeServerSocketImpl.class +bridge\SystemTimeImpl.class +bridge\InstallerPackageImpl.class diff --git a/client/boardspace-maven/boardspacedevelop/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/client/boardspace-maven/boardspacedevelop/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..627c62140 --- /dev/null +++ b/client/boardspace-maven/boardspacedevelop/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,4 @@ +G:\share\projects\boardspace-maven\boardspacedevelop\javase\src\main\java\udp\UdpListenerImpl.java +G:\share\projects\boardspace-maven\boardspacedevelop\javase\src\main\java\bridge\NativeServerSocketImpl.java +G:\share\projects\boardspace-maven\boardspacedevelop\javase\src\main\java\bridge\InstallerPackageImpl.java +G:\share\projects\boardspace-maven\boardspacedevelop\javase\src\main\java\bridge\SystemTimeImpl.java diff --git a/client/boardspace-maven/boardspacedevelop/pom.xml b/client/boardspace-maven/boardspacedevelop/pom.xml index fb36c9369..1b4f68e5a 100644 --- a/client/boardspace-maven/boardspacedevelop/pom.xml +++ b/client/boardspace-maven/boardspacedevelop/pom.xml @@ -116,13 +116,13 @@ - 7.0.55 + 7.0.130 - LATEST + 7.0.130 diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build Android Studio Project.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build Android Studio Project.launch deleted file mode 100644 index 89bc77d6f..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build Android Studio Project.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build JavaSE Desktop App.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build JavaSE Desktop App.launch deleted file mode 100644 index b69915655..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build JavaSE Desktop App.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build iOS Xcode Project.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build iOS Xcode Project.launch deleted file mode 100644 index 07f5f0178..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Build iOS Xcode Project.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Debug Simulator.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Debug Simulator.launch deleted file mode 100644 index bcfe27258..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Debug Simulator.launch +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Debug in Simulator.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Debug in Simulator.launch deleted file mode 100644 index 9ab14500f..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Debug in Simulator.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Remote Debug Simulator.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Remote Debug Simulator.launch deleted file mode 100644 index 87f1f47df..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Remote Debug Simulator.launch +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Run Desktop.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Run Desktop.launch deleted file mode 100644 index 24cc21e94..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Run Desktop.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Run Simulator.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Run Simulator.launch deleted file mode 100644 index 38d839ca6..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Run Simulator.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Android Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Android Build.launch deleted file mode 100644 index fb305430b..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Android Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Javascript Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Javascript Build.launch deleted file mode 100644 index c599a9faf..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Javascript Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Mac Desktop Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Mac Desktop Build.launch deleted file mode 100644 index d796ff2a6..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Mac Desktop Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Windows Desktop Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Windows Desktop Build.launch deleted file mode 100644 index c5496b4e4..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Windows Desktop Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Windows UWP Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Windows UWP Build.launch deleted file mode 100644 index fee617675..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send Windows UWP Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send iOS Debug Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send iOS Debug Build.launch deleted file mode 100644 index 2d4e42244..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send iOS Debug Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send iOS Release Build.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send iOS Release Build.launch deleted file mode 100644 index fd93c5d2a..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Send iOS Release Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Update Codename One.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Update Codename One.launch deleted file mode 100644 index 8651f6b61..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop - Update Codename One.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop Settings.launch b/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop Settings.launch deleted file mode 100644 index b077f8327..000000000 --- a/client/boardspace-maven/boardspacedevelop/tools/eclipse/BoardspaceDevelop Settings.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/win/.classpath b/client/boardspace-maven/boardspacedevelop/win/.classpath index ac74422ca..a5d95095c 100644 --- a/client/boardspace-maven/boardspacedevelop/win/.classpath +++ b/client/boardspace-maven/boardspacedevelop/win/.classpath @@ -9,7 +9,6 @@ - @@ -19,7 +18,7 @@ - + @@ -29,12 +28,5 @@ - - - - - - - diff --git a/client/boardspace-maven/boardspacedevelop/win/.gitignore b/client/boardspace-maven/boardspacedevelop/win/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacedevelop/win/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/android/.classpath b/client/boardspace-maven/boardspacerelease/android/.classpath index 8f9ef0edb..6b3946a68 100644 --- a/client/boardspace-maven/boardspacerelease/android/.classpath +++ b/client/boardspace-maven/boardspacerelease/android/.classpath @@ -25,7 +25,7 @@ - + diff --git a/client/boardspace-maven/boardspacerelease/android/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (3).launch b/client/boardspace-maven/boardspacerelease/android/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (3).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/android/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (3).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/android/.gitignore b/client/boardspace-maven/boardspacerelease/android/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacerelease/android/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/android/.project b/client/boardspace-maven/boardspacerelease/android/.project index ab8d4142d..c31ad858a 100644 --- a/client/boardspace-maven/boardspacerelease/android/.project +++ b/client/boardspace-maven/boardspacerelease/android/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (3).launch + @@ -20,6 +25,13 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + android + 2 + G:/share/projects/boardspace-codename1/native/android + + 1643353148799 diff --git a/client/boardspace-maven/boardspacerelease/android/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacerelease/android/.settings/org.eclipse.core.resources.prefs index abdea9ac0..99f26c020 100644 --- a/client/boardspace-maven/boardspacerelease/android/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacerelease/android/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacerelease/android/pom.xml b/client/boardspace-maven/boardspacerelease/android/pom.xml index cc6895c2c..c16ef7b59 100644 --- a/client/boardspace-maven/boardspacerelease/android/pom.xml +++ b/client/boardspace-maven/boardspacerelease/android/pom.xml @@ -2,15 +2,15 @@ 4.0.0 - com.boardspace - boardspacerelease + dev.boardspace + boardspacedevelop 1.0-SNAPSHOT - com.boardspace - boardspacerelease-android + dev.boardspace + boardspacedevelop-android 1.0-SNAPSHOT - boardspacerelease-android + boardspacedevelop-android UTF-8 @@ -25,12 +25,9 @@ - src/main/java + ../../../boardspace-codename1/native/android/ - - src/main/resources - - + com.codenameone diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries deleted file mode 100644 index 9b7a0c46e..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/NativeServerSocketImpl.java/1.1/Fri Nov 30 07:22:34 2018// -/SystemTimeImpl.java/1.2/Wed Jun 3 17:54:49 2020// -/InstallerPackageImpl.java/1.7/Sat Jun 19 19:28:20 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Extra b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Extra deleted file mode 100644 index 72f03454c..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Extra +++ /dev/null @@ -1,3 +0,0 @@ -/NativeServerSocketImpl.java///1543595950//// -/SystemTimeImpl.java///1598217866//// -/InstallerPackageImpl.java///1624576311//// diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Extra.Old deleted file mode 100644 index eae2e1fbd..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Extra.Old +++ /dev/null @@ -1,3 +0,0 @@ -/NativeServerSocketImpl.java///1543595950//// -/SystemTimeImpl.java///1598217866//// -/InstallerPackageImpl.java///1623877901//// diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Old b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Old deleted file mode 100644 index 78e99d860..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Entries.Old +++ /dev/null @@ -1,4 +0,0 @@ -/NativeServerSocketImpl.java/1.1/Fri Nov 30 07:22:34 2018// -/SystemTimeImpl.java/1.2/Wed Jun 3 17:54:49 2020// -/InstallerPackageImpl.java/1.6/Wed Jun 16 16:24:03 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Repository b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Repository deleted file mode 100644 index 93f2c312c..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/android/bridge diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Root b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/InstallerPackageImpl.java b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/InstallerPackageImpl.java deleted file mode 100644 index 1b64a6a93..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/InstallerPackageImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import android.app.Activity; -import com.codename1.impl.android.AndroidNativeUtil; -import android.content.pm.PackageManager; -import android.content.Context; -import android.content.pm.PackageInfo; -import android.content.pm.ActivityInfo; -import android.net.wifi.WifiManager; -import android.util.DisplayMetrics; -import android.os.Build; -import android.os.Build.VERSION; -import android.view.Display; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.nio.ByteOrder; -import java.math.BigInteger; -import android.os.Build; -import java.lang.reflect.Method; -import java.io.DataOutputStream; - -import android.app.Application; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; - - -public class InstallerPackageImpl { - // cribbed from various "drawer" source code, decompiled from the lastgameboard chess app./ - public static final String ANALYTICS_SENDER_PACKAGE = "com.lastgameboard.gameboardservicetest"; - public static String ACTION_CHANGE_VISIBILITY = "com.lastgameboard.gameboardservice.drawer.action_CHANGE_DRAWER_VISIBLITY"; - public static String EXTRA_CHANGE_VISIBILITY = "com.lastgameboard.gameboardservice.drawer.key.CHANGE_DRAWER_VISIBLITY_STATE"; - - public static void setDrawerVisibility(Application application, boolean z) - { - setDrawerVisibility(application.getApplicationContext(), z); - } - - public static void setDrawerVisibility(Context context, boolean z) - { - Intent intent = new Intent(); - intent.setAction(ACTION_CHANGE_VISIBILITY); - intent.putExtra(EXTRA_CHANGE_VISIBILITY, z ? 1 : 0); - intent.setComponent(new ComponentName(ANALYTICS_SENDER_PACKAGE, "com.lastgameboard.gameboardservice.drawer.DrawerVisibilityBroadcastReceiver")); - context.sendBroadcast(intent); - } - - public void setDrawers(boolean vis) - { Context c = AndroidNativeUtil.getContext(); - setDrawerVisibility(c,vis); - } - - public String eval(String command) - { - try{ - Context c = AndroidNativeUtil.getContext(); - Runtime.getRuntime().exec(command); - } - catch(Throwable e){ - return e.toString(); - } - return "ok"; - } - - public String getPackages() - { - Context c = AndroidNativeUtil.getContext(); - PackageManager pm = c.getPackageManager(); - java.util.List installedPackages = pm.getInstalledPackages(PackageManager.GET_ACTIVITIES); - String res = ""; - for (PackageInfo p : installedPackages) - { - res += " "+p.packageName; - } - return(res); - } - private double stableDensity(DisplayMetrics metrics) - { // very old versions of android didn't have this variable. Rather than try - // to guess, just punt if there is a problem - try { - return metrics.DENSITY_DEVICE_STABLE; - } - catch (Throwable err) - { - return(metrics.densityDpi); - } - } - public String getOSInfo() - { Context c = AndroidNativeUtil.getContext(); - DisplayMetrics metrics = c.getResources().getDisplayMetrics(); - //Display display = c.getDisplay(); - //DisplayMetrics metrics = new DisplayMetrics (); - //display.getMetrics(metrics); - - return("brand="+android.os.Build.BRAND +"\n" - +"board="+android.os.Build.BOARD +"\n" - +"manufacturer="+android.os.Build.MANUFACTURER +"\n" - +"product="+android.os.Build.PRODUCT +"\n" - +"model="+android.os.Build.MODEL +"\n" - +"hardware="+android.os.Build.HARDWARE +"\n" - +"device="+android.os.Build.DEVICE +"\n" - +"tags="+android.os.Build.TAGS +"\n" - +"display="+android.os.Build.DISPLAY +"\n" - +"DENSITY_DEVICE_STABLE="+stableDensity(metrics)+"\n" - +"density="+metrics.density+"\n" - +"densityDpi="+metrics.densityDpi+"\n" - +"scaledDensity="+metrics.scaledDensity+"\n" - +"widthPixels="+metrics.widthPixels+"\n" - +"xdpi="+metrics.xdpi+"\n" - +"heightPixels="+metrics.heightPixels+"\n" - +"ydpi="+metrics.ydpi+"\n" - - ); - } - public String getInstaller(String pack) - { // amazon to "com.amazon.venezia" as well to contrast with - // Google Play's "com.android.vending". - Context c = AndroidNativeUtil.getContext(); - PackageManager pm = c.getPackageManager(); - return(pm.getInstallerPackageName(pack)); - } - public int getOrientation() - { - Activity act = AndroidNativeUtil.getActivity(); - return(act.getRequestedOrientation()); - } - public int setOrientation(boolean portrait,boolean reverse) - { int newo = portrait - ? (reverse - ? ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT - : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) - : (reverse - ? ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE - : ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - setOrientation(newo); - return(newo); - } - - public void setOrientation(int o) - { - Activity act = AndroidNativeUtil.getActivity(); - //act.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED); - act.setRequestedOrientation(o); - } - public double getScreenDPI() - { - Context c = AndroidNativeUtil.getContext(); - DisplayMetrics metrics = c.getResources().getDisplayMetrics(); - //Display display = c.getDisplay(); - //DisplayMetrics metrics = new DisplayMetrics (); - //display.getMetrics(metrics); - - - long z = (long)metrics.densityDpi; - long y =(long)stableDensity(metrics); - long x = (long)metrics.xdpi; - long v = z + (x<<11)+ (y<<22); - return((double)v); - } - - public String getLocalWifiIpAddress() { - Context context = AndroidNativeUtil.getContext(); - WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - int ipAddress = wifiManager.getConnectionInfo().getIpAddress(); - - if (ByteOrder.nativeOrder().equals(ByteOrder.LITTLE_ENDIAN)) { - ipAddress = Integer.reverseBytes(ipAddress); - } - - byte[] ipByteArray = BigInteger.valueOf(ipAddress).toByteArray(); - - String ipAddressString; - try { - ipAddressString = InetAddress.getByAddress(ipByteArray).getHostAddress(); - } catch (UnknownHostException ex) { - ipAddressString = null; - } - - return ipAddressString; - } - /** - * Retrieves the net.hostname system property - */ - public String getHostName() { - try { - Method getString = Build.class.getDeclaredMethod("getString", String.class); - getString.setAccessible(true); - return getString.invoke(null, "net.hostname").toString(); - } catch (Exception ex) { - return null; - } - } - - public void hardExit() { - AndroidNativeUtil.getActivity().finish(); - System.exit(0); - } - - public boolean isSupported() { - return true; - } - -} diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/NativeServerSocketImpl.java b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/NativeServerSocketImpl.java deleted file mode 100644 index 3e86e557c..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/NativeServerSocketImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import java.lang.Exception; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.util.Hashtable; -import java.net.ServerSocket; -/** - * this javase version of NativeServerSocket is essentially - * identical to the JavaSE version, which is in turn essentially - * identical to the plain java version. - * - * This implements server socket binding and an "accept" factory - * the key to it's success is that it also implements the raw I/O - * on the socket streams that the factory produces. - * - * @author Ddyer - * - */ -public class NativeServerSocketImpl implements bridge.NativeServerSocket -{ // - // native interfaces are restructed from returning objects, so instead - // it returns integers which act as handles for the underlying objects. - // - private HashtableobjectMap = new Hashtable(); - private HashtablereverseMap = new Hashtable(); - private int nextKey = 1000; - private Object find(int key) { return(objectMap.get(key)); } - private void forget(int key) { objectMap.remove(key); } - private int remember(Object something) - { int v = nextKey++; - objectMap.put(v,something); - return(v); - } - private int errorCode(String something) - { if(reverseMap.containsKey(something)) - { return reverseMap.get(something); - } - int v = -remember(something); - reverseMap.put(something, v); - return(v); - } - // - // native interfaces also can't throw errors, so errors are caught - // and their .toString() values are remembered. For general compatibility - // with i/o, values from -1 up are not errors. - // - public String getIOExceptionMessage(int handle) - { return ( (handle>-1) ? null : (String)(find(-handle))); - } - - // service for NativeOutputStream - public int write(int handle, int param1) { - try { - OutputStream o = (OutputStream)find(handle); - o.write(param1); - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int writeArray(int param, byte[] param1, int param2, int param3) - { try { - OutputStream stream = (OutputStream)find(param); - stream.write(param1,param2,param3); - return(0); - } catch (Exception e) - { return(errorCode(e.toString())); - } - } - - /* - * service for NativeInputStream - * - */ - public int read(int param) { - try { - InputStream s = (InputStream)find(param); - int val = s.read(); - return(val); - } - catch (Exception e) { return(errorCode(e.toString())); } - } - public int readArray(int param, byte[] param1, int param2, int param3) - { - try { - InputStream stream = (InputStream)find(param); - int v = stream.read(param1,param2,param3); - return(v); - }catch (Exception e) - { return(errorCode(e.toString())); - } - } - public int closeInput(int param) { - try { - InputStream stream = (InputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int closeSocket(int param) { - try { - Socket sock = (Socket)find(param); - if(sock!=null) { sock.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int closeOutput(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int flush(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.flush(); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - /* - * service for bind and accept - */ - private boolean bound = false; - private ServerSocket serverSocket = null; - public int unBind() - { try { - if(bound) - { - bound = false; - serverSocket.close(); - serverSocket=null; - } - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int bindSocket(int param) - { bound = false; - try { - serverSocket = new ServerSocket(param); - bound = true; - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - public int listen() { - if(bound) - { - try { - Socket listenSocket = serverSocket.accept(); - return(listenSocket==null ? -1 : remember(listenSocket)); - } catch (Exception e) { return(errorCode(e.toString())); } - } - else { return(errorCode("socket not bound")); } - } - - // the listener calls listen, then - // gets these handles and uses them to create - // input and output streams - public int getOutputHandle(int handle) - { try { - { Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) - { - return(remember(listenSocket.getOutputStream())); - } - else { return(errorCode("invalid socket handle")); } - } - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int getInputHandle(int handle) { - try { - Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) { return(remember(listenSocket.getInputStream())); } - else { return(errorCode("invalid socket handle")); } - } - catch (Exception e) { return(errorCode(e.toString())); } - } - - - public boolean isSupported() { - return true; - } - - public int connect(String host, int port) { - try { - @SuppressWarnings("resource") - Socket listenSocket = new Socket(host, port); - if(listenSocket!=null) { return(remember(listenSocket)); } - } catch (Exception err) { errorCode(err.toString()); } - return(-1); - } -} diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/SystemTimeImpl.java b/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/SystemTimeImpl.java deleted file mode 100644 index 7528c441c..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/bridge/SystemTimeImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import android.os.SystemClock; - -public class SystemTimeImpl { - public long currentNanoTime() { - return SystemClock.elapsedRealtimeNanos(); - } - - public boolean isSupported() { - return true; - } - -} diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries deleted file mode 100644 index a930078c3..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/UdpListenerImpl.java/1.5/Wed Dec 8 18:02:44 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Extra b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Extra deleted file mode 100644 index e80fa8f5a..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Extra +++ /dev/null @@ -1 +0,0 @@ -/UdpListenerImpl.java///1638987791//// diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Extra.Old deleted file mode 100644 index 806e921c0..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Extra.Old +++ /dev/null @@ -1 +0,0 @@ -/UdpListenerImpl.java///1622582052//// diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Old b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Old deleted file mode 100644 index c012ca8a3..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Entries.Old +++ /dev/null @@ -1,2 +0,0 @@ -/UdpListenerImpl.java/1.4/Tue Jun 1 21:14:12 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Repository b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Repository deleted file mode 100644 index 093f501ca..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/android/udp diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Root b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/UdpListenerImpl.java b/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/UdpListenerImpl.java deleted file mode 100644 index e3ae27d1b..000000000 --- a/client/boardspace-maven/boardspacerelease/android/src/main/java/udp/UdpListenerImpl.java +++ /dev/null @@ -1,149 +0,0 @@ -package udp; - -import com.codename1.impl.android.AndroidNativeUtil; -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.SocketTimeoutException; -import java.net.UnknownHostException; -import java.util.Vector; -import android.net.wifi.WifiManager; -import android.content.Context ; -import android.net.DhcpInfo ; -import java.util.Random; -/** - * android implementation of the UDP transmit/receive interface. This has - * just one important parameter, the port to broadcast on. - * - * This filters out our own messages by prepending a sender id to each - * message and recognising it. - * - * @author Ddyer - * - */ -public class UdpListenerImpl -{ - boolean exitRequest=false; - String senderId = "S"+(new Random().nextLong()&0x7fffffffffffffffL)+":"; - Vectormessages = new Vector(); - boolean filter=false; - /** - * get a message or wait a maximum amount of time for one to arrive. - * as usual, wait 0 means forever. wait -1 means wait never. - * otherwise wait time in milliseconds - * - * messages from this interface will begin with s....: or error: - * but remember that it's a public broadcast, so any kind of crap - * might occur. - * @param wait - * @return - */ - public String getMessage(int wait) - { synchronized(this) - { if(!exitRequest - && (wait>=0) - && (messages.size()==0)) - { try { wait(wait); } catch (InterruptedException e) {} } - } - synchronized (messages) - { - if(messages.size()>0) - { - return(messages.remove(0)); - }} - return(null); - } - - private InetAddress getBroadcastAddress() throws IOException - { - Context c = AndroidNativeUtil.getContext(); - WifiManager wifi = (WifiManager) c.getSystemService(Context.WIFI_SERVICE); - DhcpInfo dhcp = wifi.getDhcpInfo(); - // handle null somehow - int broadcast = (dhcp.ipAddress & dhcp.netmask) | ~dhcp.netmask; - byte[] quads = new byte[4]; - for (int k = 0; k < 4; k++) - quads[k] = (byte) ((broadcast >> k * 8) & 0xFF); - return InetAddress.getByAddress(quads); - } - - public boolean sendMessage(String msg,int broadcastPort) - { boolean ok = false; - try { - - DatagramSocket socket = new DatagramSocket(); - if(socket!=null) - { - socket.setBroadcast(true); - InetAddress broadcastIPAddress = getBroadcastAddress(); - if(filter) { msg = senderId+msg; } - byte[] bytes = msg.getBytes(); - DatagramPacket packet = new DatagramPacket(bytes,bytes.length, broadcastIPAddress , broadcastPort); - socket.send(packet); - socket.close(); - ok = true; - } - else { synchronized(messages) { messages.add("error: socket creation failed for "+msg); }} - } - catch (IOException e) - { if(!exitRequest) { synchronized (messages) { messages.add("error: udp on send "+e); }} - } - return(ok); - } - - /** - * receive broadcast messages on a specfied port, put them - * in a queue to be retrieved by some other process. - * - * @param broadcastPort - */ - public void runBroadcastReceiver(int broadcastPort,boolean fil) - { - try { - filter = fil; - exitRequest = false; - DatagramSocket socket = new DatagramSocket(broadcastPort, InetAddress.getByName("0.0.0.0")); - if(socket!=null) - { - socket.setBroadcast(true); - while(!exitRequest) - { - DatagramPacket packet = new DatagramPacket(new byte[1000], 1000); - socket.receive(packet); - - InetAddress ip = packet.getAddress(); - String host = ip.getHostAddress(); - String msg = new String(packet.getData(), packet.getOffset(), packet.getLength()); - if(filter && msg.charAt(0)=='S') - { if(!msg.startsWith(senderId)) - { - int dx = msg.indexOf(':'); - if(dx>0) { msg = msg.substring(dx+1); } - } - else { msg = null; } - } - if(msg!=null) - { - synchronized(messages) { messages.add(host+":" + msg); } - synchronized(this) { notifyAll(); } - } - } - socket.close(); - } - } - catch (IOException e) - { - if(!exitRequest) { synchronized(messages) { messages.add("error: on receive "+e); }} - } - } - public void stop() - { exitRequest = true; - } - public boolean isSupported() { - return true; - } -} - - diff --git a/client/boardspace-maven/boardspacerelease/common/.classpath b/client/boardspace-maven/boardspacerelease/common/.classpath index d6896d2d4..7d2d267db 100644 --- a/client/boardspace-maven/boardspacerelease/common/.classpath +++ b/client/boardspace-maven/boardspacerelease/common/.classpath @@ -1,41 +1,40 @@ - + + + + - - + - - - - - - + + + - + - + + - + - + - + - diff --git a/client/boardspace-maven/boardspacerelease/common/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (4).launch b/client/boardspace-maven/boardspacerelease/common/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (4).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/common/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (4).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/common/.gitignore b/client/boardspace-maven/boardspacerelease/common/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacerelease/common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/common/.project b/client/boardspace-maven/boardspacerelease/common/.project index 5d92c891f..f3a4b4156 100644 --- a/client/boardspace-maven/boardspacerelease/common/.project +++ b/client/boardspace-maven/boardspacerelease/common/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (4).launch + @@ -24,17 +29,17 @@ boardspace core 2 - F:/github/boardspace.net/client/boardspace-codename1/boardspace core + G:/share/projects/boardspace-codename1/boardspace core boardspace games 2 - F:/github/boardspace.net/client/boardspace-codename1/boardspace games + G:/share/projects/boardspace-codename1/boardspace games codename1 2 - F:/github/boardspace.net/client/boardspace-codename1/codename1 + G:/share/projects/boardspace-codename1/codename1 diff --git a/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.core.resources.prefs index 839d647ee..99f26c020 100644 --- a/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.jdt.core.prefs b/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.jdt.core.prefs index 2f5cc74c3..8b5c4dca7 100644 --- a/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.jdt.core.prefs +++ b/client/boardspace-maven/boardspacerelease/common/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,15 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled diff --git a/client/boardspace-maven/boardspacerelease/common/codenameone_settings.properties b/client/boardspace-maven/boardspacerelease/common/codenameone_settings.properties index 740a5ab25..dcc2db858 100644 --- a/client/boardspace-maven/boardspacerelease/common/codenameone_settings.properties +++ b/client/boardspace-maven/boardspacerelease/common/codenameone_settings.properties @@ -32,7 +32,7 @@ codename1.arg.ios.zsign=true codename1.arg.java.version=8 codename1.description= codename1.displayName=boardspace.net -codename1.icon=G\:\\share\\projects\\boardspace-codename1\\icons\\boardspace-icon-512x512.png +codename1.icon=G\:\\share\\projects\\boardspace-codename1\\icons\\boardspace-icon-maven-512x512.png codename1.ios.appid=N9ZJLP5456.com.boardspace codename1.ios.certificate= codename1.ios.certificatePassword= @@ -54,7 +54,7 @@ codename1.rim.signtoolCsk= codename1.rim.signtoolDb= codename1.secondaryTitle=boardspace.net codename1.vendor=CodenameOne -codename1.version=7.63 +codename1.version=7.76 guiResource=theme.res libVersion=211 package=generated diff --git a/client/boardspace-maven/boardspacerelease/common/icon.png b/client/boardspace-maven/boardspacerelease/common/icon.png index 1f4fa5dd2..eff6f0c22 100644 Binary files a/client/boardspace-maven/boardspacerelease/common/icon.png and b/client/boardspace-maven/boardspacerelease/common/icon.png differ diff --git a/client/boardspace-maven/boardspacerelease/common/pom.xml b/client/boardspace-maven/boardspacerelease/common/pom.xml index bffa1762c..1f7f48d74 100644 --- a/client/boardspace-maven/boardspacerelease/common/pom.xml +++ b/client/boardspace-maven/boardspacerelease/common/pom.xml @@ -1,16 +1,20 @@ + + 4.0.0 + - com.boardspace - boardspacerelease + dev.boardspace + boardspacedevelop 1.0-SNAPSHOT - com.boardspace - boardspacerelease-common + dev.boardspace + boardspacedevelop-common 1.0-SNAPSHOT jar + @@ -32,6 +36,7 @@ ${user.home}/.codenameone/guibuilder.jar + org.apache.maven.plugins maven-antrun-plugin @@ -178,6 +183,7 @@ + org.codehaus.mojo exec-maven-plugin @@ -302,12 +308,114 @@ + + + + + g:/share/projects/boardspace-maven/boardspacedevelop/common/src/main/java/ + + **/*.res + + + + + + maven-resources-plugin + 2.7 + + + + copy-respources + generate-sources + + copy-resources + + + src/main/java/ + + + ../../../boardspace-codename1/codename1/ + **/*.java + **/*.res + + + ../../../boardspace-codename1/boardspace core/ + **/*.java + **/*.res + + + ../../../boardspace-codename1/boardspace games/ + **/*.java + **/*.res + + + + + + + + + + maven-clean-plugin + + + + + src + + + + + + + org.apache.maven.plugins maven-compiler-plugin + - 1.8 + 1.8 1.8 @@ -342,7 +450,8 @@ generate-gui-sources - + + cn1-process-classes process-classes @@ -351,6 +460,8 @@ + + attach-test-artifact test @@ -389,12 +500,12 @@ - generate-gui-sources + compliance-check - css - compliance-check + generate-gui-sources + css diff --git a/client/boardspace-maven/boardspacerelease/common/pom.xml~ b/client/boardspace-maven/boardspacerelease/common/pom.xml~ new file mode 100644 index 000000000..23e5ad383 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/common/pom.xml~ @@ -0,0 +1,420 @@ + + + 4.0.0 + + com.boardspace + boardspacerelease + 1.0-SNAPSHOT + + com.boardspace + boardspacerelease-common + 1.0-SNAPSHOT + jar + + + + + com.codenameone + codenameone-core + provided + + + + + + + + + + + install-codenameone + ${user.home}/.codenameone/guibuilder.jar + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.0.0 + + + + validate + + run + + + + + + + + + + + + + + + + + + + + + + + + + kotlin + + + + ${basedir}/src/main/kotlin + + + + 1.3.72 + true + + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + + + + org.jetbrains + annotations + 13.0 + + + com.codenameone + java-runtime + provided + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/codenameone_settings.properties + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + + compile + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/java + + + -no-reflect + -no-jdk + + + + + test-compile + + test-compile + + + + ${project.basedir}/src/test/kotlin + ${project.basedir}/src/test/java + + + -no-reflect + -no-jdk + + + + + + + + + + + + + javase + + + codename1.platform + javase + + + + javase + + + + + org.codehaus.mojo + exec-maven-plugin + + java + true + + -XX:MaxPermSize=128M + -Xmx1024M + + -classpath + + ${exec.mainClass} + ${cn1.mainClass} + + + + + + + + + + simulator + + javase + + + + + + ios-debug + + + iphone + + + ios + + + + + ios-release + + + iphone + true + + + ios + true + + + + + javascript + + javascript + javascript + + + + + android + + android + android + + + + + uwp + + windows + win + + + + + windows + + desktop_windows + javase + + + + + mac + + desktop_macosx + javase + + + + + + + "g:/share/projects/boardspace-codename1/boardspace core,g:/share/projects/boardspace-codename1/boardspace games/" + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + true + 1.8 + 1.8 + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/codenameone_settings.properties + + + + + + + + com.codenameone + codenameone-maven-plugin + + + + generate-gui-sources + process-sources + + generate-gui-sources + + + + cn1-process-classes + process-classes + + compliance-check + css + + + + + attach-test-artifact + test + + attach-test-artifact + + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.codenameone + + + codenameone-maven-plugin + + + [7.0.55,) + + + + generate-gui-sources + + css + + compliance-check + + + + + + + + + + + + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/common/src/test/java/com/boardspace/MyFirstTest.java b/client/boardspace-maven/boardspacerelease/common/src/test/java/com/boardspace/MyFirstTest.java deleted file mode 100644 index 0e88da2ca..000000000 --- a/client/boardspace-maven/boardspacerelease/common/src/test/java/com/boardspace/MyFirstTest.java +++ /dev/null @@ -1,23 +0,0 @@ - -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package com.boardspace; - -import com.codename1.testing.AbstractTest; - -/** - * - * @author shannah - */ -public class MyFirstTest extends AbstractTest { - - @Override - public boolean runTest() throws Exception { - return true; - } - - -} diff --git a/client/boardspace-maven/boardspacerelease/ios/.classpath b/client/boardspace-maven/boardspacerelease/ios/.classpath index ec8625fe9..eddccc6a7 100644 --- a/client/boardspace-maven/boardspacerelease/ios/.classpath +++ b/client/boardspace-maven/boardspacerelease/ios/.classpath @@ -25,7 +25,7 @@ - + diff --git a/client/boardspace-maven/boardspacerelease/ios/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (5).launch b/client/boardspace-maven/boardspacerelease/ios/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (5).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/ios/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (5).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/ios/.gitignore b/client/boardspace-maven/boardspacerelease/ios/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/ios/.project b/client/boardspace-maven/boardspacerelease/ios/.project index 536d59006..6faa84d50 100644 --- a/client/boardspace-maven/boardspacerelease/ios/.project +++ b/client/boardspace-maven/boardspacerelease/ios/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (5).launch + @@ -20,6 +25,13 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + ios + 2 + G:/share/projects/boardspace-codename1/native/ios + + 1643353187703 diff --git a/client/boardspace-maven/boardspacerelease/ios/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacerelease/ios/.settings/org.eclipse.core.resources.prefs index 5c8f7c95f..99f26c020 100644 --- a/client/boardspace-maven/boardspacerelease/ios/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacerelease/ios/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/objectivec=UTF-8 -encoding//src/main/resources=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacerelease/ios/pom.xml b/client/boardspace-maven/boardspacerelease/ios/pom.xml index c536dde4a..a7c56e21c 100644 --- a/client/boardspace-maven/boardspacerelease/ios/pom.xml +++ b/client/boardspace-maven/boardspacerelease/ios/pom.xml @@ -2,15 +2,15 @@ 4.0.0 - com.boardspace - boardspacerelease + dev.boardspace + boardspacedevelop 1.0-SNAPSHOT - com.boardspace - boardspacerelease-ios + dev.boardspace + boardspacedevelop-ios 1.0-SNAPSHOT - boardspacerelease-ios + boardspacedevelop-ios UTF-8 @@ -23,7 +23,7 @@ - src/main/objectivec + ../../../boardspace-codename1/native/ios/ src/main/resources diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries deleted file mode 100644 index 240cb9c49..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries +++ /dev/null @@ -1,9 +0,0 @@ -/bridge_NativeServerSocketImpl.h/1.1/Fri Nov 30 16:53:51 2018// -/bridge_NativeServerSocketImpl.m/1.1/Fri Nov 30 16:53:51 2018// -/bridge_SystemTimeImpl.h/1.1/Wed Jun 3 17:56:10 2020// -/bridge_SystemTimeImpl.m/1.1/Fri Jun 5 00:21:16 2020// -/bridge_InstallerPackageImpl.h/1.4/Sat Jun 19 18:45:38 2021// -/bridge_InstallerPackageImpl.m/1.4/Sat Jun 19 18:46:24 2021// -/udp_UdpListenerImpl.h/1.2/Wed Dec 8 18:05:42 2021// -/udp_UdpListenerImpl.m/1.4/Wed Dec 8 18:05:05 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Extra b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Extra deleted file mode 100644 index df97f4a6f..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Extra +++ /dev/null @@ -1,8 +0,0 @@ -/bridge_NativeServerSocketImpl.h///1591200849//// -/bridge_NativeServerSocketImpl.m///1591200849//// -/bridge_SystemTimeImpl.h///1598217866//// -/bridge_SystemTimeImpl.m///1598217866//// -/bridge_InstallerPackageImpl.h///1638987812//// -/bridge_InstallerPackageImpl.m///1638987812//// -/udp_UdpListenerImpl.h///1638987865//// -/udp_UdpListenerImpl.m///1638987865//// diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Extra.Old deleted file mode 100644 index 82f073fd6..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Extra.Old +++ /dev/null @@ -1,8 +0,0 @@ -/bridge_NativeServerSocketImpl.h///1591200849//// -/bridge_NativeServerSocketImpl.m///1591200849//// -/bridge_SystemTimeImpl.h///1598217866//// -/bridge_SystemTimeImpl.m///1598217866//// -/bridge_InstallerPackageImpl.h///1638987812//// -/bridge_InstallerPackageImpl.m///1638987812//// -/udp_UdpListenerImpl.h///1540947592//// -/udp_UdpListenerImpl.m///1563235133//// diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Old b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Old deleted file mode 100644 index ab7c48312..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Entries.Old +++ /dev/null @@ -1,9 +0,0 @@ -/bridge_NativeServerSocketImpl.h/1.1/Fri Nov 30 16:53:51 2018// -/bridge_NativeServerSocketImpl.m/1.1/Fri Nov 30 16:53:51 2018// -/bridge_SystemTimeImpl.h/1.1/Wed Jun 3 17:56:10 2020// -/bridge_SystemTimeImpl.m/1.1/Fri Jun 5 00:21:16 2020// -/bridge_InstallerPackageImpl.h/1.4/Sat Jun 19 18:45:38 2021// -/bridge_InstallerPackageImpl.m/1.4/Sat Jun 19 18:46:24 2021// -/udp_UdpListenerImpl.h/1.1/Wed Oct 31 00:59:52 2018// -/udp_UdpListenerImpl.m/1.3/Mon Jul 15 23:58:53 2019// -D diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Repository b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Repository deleted file mode 100644 index 198015f58..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/ios diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Root b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_InstallerPackageImpl.h b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_InstallerPackageImpl.h deleted file mode 100644 index c223325a5..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_InstallerPackageImpl.h +++ /dev/null @@ -1,16 +0,0 @@ -#import - -@interface bridge_InstallerPackageImpl : NSObject { -} - --(NSString*)getPackages; --(NSString*)getOSInfo; --(NSString*)getHostName; --(int)getOrientation; --(int)setOrientation:(BOOL)param param1:(BOOL)param1; --(NSString*)getInstaller:(NSString*)param; --(NSString*)getLocalWifiIpAddress; --(double)getScreenDPI; --(BOOL)isSupported; --(void)hardExit; -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_InstallerPackageImpl.m b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_InstallerPackageImpl.m deleted file mode 100644 index 8b9ee0de7..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_InstallerPackageImpl.m +++ /dev/null @@ -1,46 +0,0 @@ -#import "bridge_InstallerPackageImpl.h" - -@implementation bridge_InstallerPackageImpl - --(NSString*)eval:(NSString*)param{ - return nil; -} - --(NSString*)getPackages{ - return nil; -} - --(NSString*)getOSInfo{ - return nil; -} - --(NSString*)getHostName{ - return nil; -} - --(int)getOrientation{ - return 0; -} --(double)getScreenDPI{ - return(96.0); -} - --(int)setOrientation:(BOOL)param param1:(BOOL)param1{ - return 0; -} - --(NSString*)getInstaller:(NSString*)param{ - return nil; -} - --(NSString*)getLocalWifiIpAddress{ - return nil; -} --(void)hardExit { -} - --(BOOL)isSupported{ - return NO; -} - -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_NativeServerSocketImpl.h b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_NativeServerSocketImpl.h deleted file mode 100644 index 00b4db6cc..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_NativeServerSocketImpl.h +++ /dev/null @@ -1,22 +0,0 @@ -#import - -@interface bridge_NativeServerSocketImpl : NSObject { -} - --(int)write:(int)param param1:(int)param1; --(int)connect:(NSString*)param param1:(int)param1; --(int)listen; --(int)read:(int)param; --(int)flush:(int)param; --(int)writeArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3; --(int)readArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3; --(int)closeSocket:(int)param; --(NSString*)getIOExceptionMessage:(int)param; --(int)bindSocket:(int)param; --(int)closeOutput:(int)param; --(int)unBind; --(int)getOutputHandle:(int)param; --(int)closeInput:(int)param; --(int)getInputHandle:(int)param; --(BOOL)isSupported; -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_NativeServerSocketImpl.m b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_NativeServerSocketImpl.m deleted file mode 100644 index 2f759b9fe..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_NativeServerSocketImpl.m +++ /dev/null @@ -1,69 +0,0 @@ -#import "bridge_NativeServerSocketImpl.h" - -@implementation bridge_NativeServerSocketImpl - --(int)write:(int)param param1:(int)param1{ - return 0; -} - --(int)connect:(NSString*)param param1:(int)param1{ - return 0; -} - --(int)listen{ - return 0; -} - --(int)read:(int)param{ - return 0; -} - --(int)flush:(int)param{ - return 0; -} - --(int)writeArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3{ - return 0; -} - --(int)readArray:(int)param param1:(NSData*)param1 param2:(int)param2 param3:(int)param3{ - return 0; -} - --(int)closeSocket:(int)param{ - return 0; -} - --(NSString*)getIOExceptionMessage:(int)param{ - return nil; -} - --(int)bindSocket:(int)param{ - return 0; -} - --(int)closeOutput:(int)param{ - return 0; -} - --(int)unBind{ - return 0; -} - --(int)getOutputHandle:(int)param{ - return 0; -} - --(int)closeInput:(int)param{ - return 0; -} - --(int)getInputHandle:(int)param{ - return 0; -} - --(BOOL)isSupported{ - return NO; -} - -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_SystemTimeImpl.h b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_SystemTimeImpl.h deleted file mode 100644 index 54472e1a1..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_SystemTimeImpl.h +++ /dev/null @@ -1,8 +0,0 @@ -#import - -@interface bridge_SystemTimeImpl : NSObject { -} - --(long long)currentNanoTime; --(BOOL)isSupported; -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_SystemTimeImpl.m b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_SystemTimeImpl.m deleted file mode 100644 index e59dcefff..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/bridge_SystemTimeImpl.m +++ /dev/null @@ -1,21 +0,0 @@ -#import "bridge_SystemTimeImpl.h" -#include - -@implementation bridge_SystemTimeImpl - --(long long)currentNanoTime{ - uint64_t mach_time = mach_absolute_time(); - static mach_timebase_info_data_t _clock_timebase; - if(_clock_timebase.denom == 0 ) - { - mach_timebase_info(&_clock_timebase); // Initialize timebase_info - } - double nanos = (mach_time * _clock_timebase.numer) / _clock_timebase.denom; - return((long long)nanos); -} - - --(BOOL)isSupported{ - return YES; -} -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/udp_UdpListenerImpl.h b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/udp_UdpListenerImpl.h deleted file mode 100644 index 3ad9fb29a..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/udp_UdpListenerImpl.h +++ /dev/null @@ -1,11 +0,0 @@ -#import - -@interface udp_UdpListenerImpl : NSObject { -} - --(NSString*)getMessage:(int)param; --(void)stop; --(BOOL)sendMessage:(NSString*)param param1:(int)param1; --(void)runBroadcastReceiver:(int)param param1:(BOOL)param1; --(BOOL)isSupported; -@end diff --git a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/udp_UdpListenerImpl.m b/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/udp_UdpListenerImpl.m deleted file mode 100644 index 28c6f3336..000000000 --- a/client/boardspace-maven/boardspacerelease/ios/src/main/objectivec/udp_UdpListenerImpl.m +++ /dev/null @@ -1,174 +0,0 @@ -#import "udp_UdpListenerImpl.h" - -@implementation udp_UdpListenerImpl - - #include - #include - #include - #include - #include - #include - #define BUFLEN 512 - -NSMutableArray* messages ; -BOOL exitRequest = false; -int sockn = -1; -BOOL filter = false; -char senderId[50]; -dispatch_semaphore_t waiting; - -// codename1 magic to make the garbage collector happy while we wait -static void _yield() { - CN1_YIELD_THREAD; -} - -static void _resume() { - CN1_RESUME_THREAD; -} -// get something and/or wait --(NSString*)getMessage:(int)waitTime -{ NSString *m=nil; - if(!exitRequest) - { - if((waitTime>=0) && ([messages count]==0)) - { - _yield(); // codename1 magic to mark an inactive thread - dispatch_time_t timeout = (waitTime==0) - ? DISPATCH_TIME_FOREVER - : (DISPATCH_TIME_NOW + (waitTime * (NSEC_PER_SEC/1000))); - dispatch_semaphore_wait(waiting, timeout); - _resume(); - } - @synchronized (self) - { - if([messages count]!=0) { m = messages[0]; [messages removeObjectAtIndex:0]; } - } - } - return(m); -} -// add a message to the queue --(void)addObject : (NSString *)m -{ @synchronized(self) - { - [messages addObject:m]; - dispatch_semaphore_signal(waiting); - } -} - --(id)init -{ messages = [[NSMutableArray alloc] init]; - sprintf(senderId,"S%ld:",arc4random()&0x7fffffffffffffff); - waiting = dispatch_semaphore_create(0); - sockn = -1; - return(self); -} - - --(void)stop{ - exitRequest = true; - if(sockn>=0) { close(sockn); } - dispatch_semaphore_signal(waiting); - sockn=-1; -} - --(BOOL)sendMessage:(NSString*)msg param1:(int)port - { - BOOL ok = false; - //unsigned int wifiInterface = if_nametoindex("en0"); - struct sockaddr_in si_other; - int s, i; - unsigned int slen=sizeof(si_other); - char buf[BUFLEN]; - if ((s=socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP))<0) - {[self addObject : @"error:socket creation failed"]; - return(ok); - } - - static const int kOne = 1; - int success1 = setsockopt(s, SOL_SOCKET, SO_BROADCAST, &kOne, sizeof(kOne)) == 0; - if(!success1) { [self addObject : @"error:set broadcast failed"]; return(ok); } - - memset((char *) &si_other, 0, slen); - si_other.sin_family = AF_INET; - si_other.sin_len = slen; - si_other.sin_addr.s_addr = INADDR_BROADCAST; - si_other.sin_port = htons(port); - - sprintf(buf, "%s%s",(filter?senderId:""),[msg UTF8String]); - if (sendto(s, buf, strlen(buf), 0, (struct sockaddr *)&si_other, slen)<0) - { [self addObject : @"error:sendto failed"]; - return(ok); - } - close(s); - ok = true; - return(ok); -} - -// bind the receiver and run the listen loop --(void)runBroadcastReceiver:(int)port param1:(BOOL)fil -{ - struct sockaddr_in si_me; - int i; - static const int kOne = 1; - unsigned int slen=sizeof(si_me); - filter = fil; - exitRequest = false; - if ((sockn=socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP))<0) - { [self addObject:@"error: create socket failed"]; - return; - - } - - memset((char *) &si_me, 0, sizeof(si_me)); - si_me.sin_family = AF_INET; - si_me.sin_port = htons(port); - si_me.sin_addr.s_addr = htonl(INADDR_ANY); - si_me.sin_len = slen; - - if (bind(sockn, (struct sockaddr *)&si_me, sizeof(si_me))<0) - {[self addObject:@"error: sock bind failed"]; - return; - } - - do { [self broadcastRecv] ; } while (!exitRequest); - } - // receive a message - -(BOOL)broadcastRecv - { - if(sockn>=0) - { struct sockaddr_in si_other; - unsigned int slen = sizeof(si_other); - char buf[BUFLEN]; - _yield(); // codename1 magic to mark an inactive thread - ssize_t siz = recvfrom(sockn, buf, BUFLEN, 0, (struct sockaddr *)&si_other, &slen); - _resume(); - if(siz>=0) - { - char str[INET_ADDRSTRLEN]; - buf[siz]=(char)0; - inet_ntop(AF_INET,&si_other.sin_addr,str,INET_ADDRSTRLEN); - char *idx = buf; - if(filter && buf[0]=='S') - { if(strcmp(buf,senderId)!=0) - { - idx = index(buf,':'); - if(idx==nil) { idx = buf; } else { idx++; } - } - else { idx = nil; } - } - if(idx!=nil) - { - NSString *recv = [NSString stringWithFormat:@"%s:%s",str,idx]; - [self addObject: recv]; - return(YES); - } - }} - return(NO); -} - --(BOOL)isSupported -{ - return YES; -} - -@end diff --git a/client/boardspace-maven/boardspacerelease/javascript/.classpath b/client/boardspace-maven/boardspacerelease/javascript/.classpath index acf707c54..65cef933e 100644 --- a/client/boardspace-maven/boardspacerelease/javascript/.classpath +++ b/client/boardspace-maven/boardspacerelease/javascript/.classpath @@ -25,7 +25,7 @@ - + diff --git a/client/boardspace-maven/boardspacerelease/javascript/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (6).launch b/client/boardspace-maven/boardspacerelease/javascript/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (6).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/javascript/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (6).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/javascript/.gitignore b/client/boardspace-maven/boardspacerelease/javascript/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacerelease/javascript/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/javascript/.project b/client/boardspace-maven/boardspacerelease/javascript/.project index dadc8cf39..41c0d0401 100644 --- a/client/boardspace-maven/boardspacerelease/javascript/.project +++ b/client/boardspace-maven/boardspacerelease/javascript/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (6).launch + diff --git a/client/boardspace-maven/boardspacerelease/javase/.classpath b/client/boardspace-maven/boardspacerelease/javase/.classpath index a138ec619..25678a74a 100644 --- a/client/boardspace-maven/boardspacerelease/javase/.classpath +++ b/client/boardspace-maven/boardspacerelease/javase/.classpath @@ -12,14 +12,7 @@ - - - - - - - - + @@ -29,12 +22,6 @@ - - - - - - - + diff --git a/client/boardspace-maven/boardspacerelease/javase/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (7).launch b/client/boardspace-maven/boardspacerelease/javase/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (7).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/javase/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (7).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/javase/.gitignore b/client/boardspace-maven/boardspacerelease/javase/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/javase/.project b/client/boardspace-maven/boardspacerelease/javase/.project index 8c110ed7a..fcd5f9324 100644 --- a/client/boardspace-maven/boardspacerelease/javase/.project +++ b/client/boardspace-maven/boardspacerelease/javase/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (7).launch + diff --git a/client/boardspace-maven/boardspacerelease/javase/.settings/org.eclipse.core.resources.prefs b/client/boardspace-maven/boardspacerelease/javase/.settings/org.eclipse.core.resources.prefs index abdea9ac0..99f26c020 100644 --- a/client/boardspace-maven/boardspacerelease/javase/.settings/org.eclipse.core.resources.prefs +++ b/client/boardspace-maven/boardspacerelease/javase/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,2 @@ eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding/=UTF-8 diff --git a/client/boardspace-maven/boardspacerelease/javase/pom.xml b/client/boardspace-maven/boardspacerelease/javase/pom.xml index b65a62a62..195d207ca 100644 --- a/client/boardspace-maven/boardspacerelease/javase/pom.xml +++ b/client/boardspace-maven/boardspacerelease/javase/pom.xml @@ -2,15 +2,15 @@ 4.0.0 - com.boardspace - boardspacerelease + dev.boardspace + boardspacedevelop 1.0-SNAPSHOT - com.boardspace - boardspacerelease-javase + dev.boardspace + boardspacedevelop-javase 1.0-SNAPSHOT - boardspacerelease-javase + boardspacedevelop-javase UTF-8 @@ -118,7 +118,7 @@ executable-jar javase - com.boardspace.BoardspaceReleaseStub + dev.boardspace.BoardspaceDevelopStub @@ -242,7 +242,7 @@ run-desktop javase - com.boardspace.BoardspaceReleaseStub + dev.boardspace.BoardspaceDevelopStub diff --git a/client/boardspace-maven/boardspacerelease/javase/src/desktop/java/com/boardspace/BoardspaceReleaseStub.java b/client/boardspace-maven/boardspacerelease/javase/src/desktop/java/com/boardspace/BoardspaceReleaseStub.java deleted file mode 100644 index 89a470ef3..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/desktop/java/com/boardspace/BoardspaceReleaseStub.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (c) 2012, Codename One and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Codename One designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Codename One through http://www.codenameone.com/ if you - * need additional information or have any questions. - */ - -package com.boardspace; - -import com.codename1.impl.javase.JavaSEPort; -import com.codename1.ui.Display; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.awt.Toolkit; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; -import java.io.File; -import java.util.Arrays; -import javax.swing.ImageIcon; -import javax.swing.JFrame; -import javax.swing.SwingUtilities; - -/** - * A wrapper class around a Codename One app, allows building desktop Java - * applications. - * - * @author Shai Almog - */ -public class BoardspaceReleaseStub implements Runnable, WindowListener { - private static final String APP_TITLE = "Hi World"; - private static final String APP_NAME = "BoardspaceRelease"; - private static final String APP_VERSION = "1.0"; - private static final int APP_WIDTH = 800; - private static final int APP_HEIGHT = 600; - private static final boolean APP_ADAPT_TO_RETINA = true; - private static final boolean APP_RESIZEABLE = true; - private static final boolean APP_FULLSCREEN = false; - public static final String BUILD_KEY = ""; - public static final String PACKAGE_NAME = ""; - public static final String BUILT_BY_USER = ""; - private static final boolean isWindows; - static { - isWindows = File.separatorChar == '\\'; - } - - private static final String[] fontFaces = null; - - private static JFrame frm; - private BoardspaceRelease mainApp; - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - try { - Class.forName("org.cef.CefApp"); - System.setProperty("cn1.javase.implementation", "cef"); - //System.setProperty("cn1.cef.bundled", "true"); - } catch (Throwable ex){} - - JavaSEPort.setNativeTheme("/NativeTheme.res"); - JavaSEPort.blockMonitors(); - JavaSEPort.setAppHomeDir("." + APP_NAME); - JavaSEPort.setExposeFilesystem(true); - JavaSEPort.setTablet(true); - JavaSEPort.setUseNativeInput(true); - JavaSEPort.setShowEDTViolationStacks(false); - JavaSEPort.setShowEDTWarnings(false); - JavaSEPort.setFullScreen(APP_FULLSCREEN); - - if(fontFaces != null) { - JavaSEPort.setFontFaces(fontFaces[0], fontFaces[1], fontFaces[2]); - } else { - // workaround for a bug in Windows where Arials unicode version isn't used - if(isWindows) { - JavaSEPort.setFontFaces("ArialUnicodeMS", "SansSerif", "Monospaced"); - } else { - JavaSEPort.setFontFaces("Arial", "SansSerif", "Monospaced"); - } - } - - - frm = new JFrame(APP_TITLE); - Toolkit tk = Toolkit.getDefaultToolkit(); - JavaSEPort.setDefaultPixelMilliRatio(tk.getScreenResolution() / 25.4 * JavaSEPort.getRetinaScale()); - Display.init(frm.getContentPane()); - Display.getInstance().setProperty("build_key", BUILD_KEY); - Display.getInstance().setProperty("package_name", PACKAGE_NAME); - Display.getInstance().setProperty("built_by_user", BUILT_BY_USER); - //placeholder - Display.getInstance().setProperty("AppName", APP_NAME); - Display.getInstance().setProperty("AppVersion", APP_VERSION); - Display.getInstance().setProperty("Platform", System.getProperty("os.name")); - Display.getInstance().setProperty("OSVer", System.getProperty("os.version")); - - SwingUtilities.invokeLater(new BoardspaceReleaseStub()); - } - - public void run() { - frm.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - frm.addWindowListener(this); - ImageIcon ic16 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic20 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic32 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic40 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - ImageIcon ic64 = new ImageIcon(getClass().getResource("/applicationIconImage_16x16.png")); - frm.setIconImages(Arrays.asList(ic16.getImage(), ic20.getImage(), ic32.getImage(), ic40.getImage(), ic64.getImage())); - GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - if(APP_FULLSCREEN && gd.isFullScreenSupported()) { - frm.setResizable(false); - frm.setUndecorated(true); - gd.setFullScreenWindow(frm); - - } else { - frm.setLocationByPlatform(true); - frm.setResizable(APP_RESIZEABLE); - int w = APP_WIDTH; - int h = APP_HEIGHT; - - frm.getContentPane().setPreferredSize(new java.awt.Dimension(w, h)); - frm.getContentPane().setMinimumSize(new java.awt.Dimension(w, h)); - frm.getContentPane().setMaximumSize(new java.awt.Dimension(w, h)); - - // replaceable with the build hint desktop.framePrepare - framePrepare(frm); - } - Display.getInstance().callSerially(new Runnable() { - @Override - public void run() { - if(Display.getInstance().isEdt()) { - mainApp = new BoardspaceRelease(); - mainApp.init(this); - mainApp.start(); - SwingUtilities.invokeLater(this); - } else { - - // replaceable with the build hint desktop.frameShow - frameShow(frm); - } - } - }); - } - - private void framePrepare(JFrame frm) { - frm.pack(); - } - - private void frameShow(JFrame frm) { - frm.setVisible(true); - } - - @Override - public void windowOpened(WindowEvent e) { - } - - @Override - public void windowClosing(WindowEvent e) { - Display.getInstance().callSerially(new Runnable() { - @Override - public void run() { - mainApp.stop(); - mainApp.destroy(); - Display.getInstance().exitApplication(); - } - }); - } - - @Override - public void windowClosed(WindowEvent e) { - } - - @Override - public void windowIconified(WindowEvent e) { - } - - @Override - public void windowDeiconified(WindowEvent e) { - } - - @Override - public void windowActivated(WindowEvent e) { - } - - @Override - public void windowDeactivated(WindowEvent e) { - // fix for https://stackoverflow.com/questions/6178132/fullscreen-java-app-minimizes-when-screensaver-turns-on - if(APP_FULLSCREEN) { - GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - frm.setExtendedState(JFrame.MAXIMIZED_BOTH); - if(gd.isFullScreenSupported()) { - frm.setResizable(false); - frm.setUndecorated(true); - gd.setFullScreenWindow(frm); - } - } - } -} diff --git a/client/boardspace-maven/boardspacerelease/javase/src/desktop/resources/NativeTheme.res b/client/boardspace-maven/boardspacerelease/javase/src/desktop/resources/NativeTheme.res deleted file mode 100644 index 83e067b69..000000000 Binary files a/client/boardspace-maven/boardspacerelease/javase/src/desktop/resources/NativeTheme.res and /dev/null differ diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/CVS/Root b/client/boardspace-maven/boardspacerelease/javase/src/main/java/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries deleted file mode 100644 index c99211455..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries +++ /dev/null @@ -1,4 +0,0 @@ -/NativeServerSocketImpl.java/1.2/Fri Nov 30 07:14:04 2018// -/SystemTimeImpl.java/1.1/Wed Jun 3 18:07:15 2020// -/InstallerPackageImpl.java/1.4/Sat Jun 19 18:49:13 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Extra b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Extra deleted file mode 100644 index c9e079f44..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Extra +++ /dev/null @@ -1,3 +0,0 @@ -/NativeServerSocketImpl.java///1543595951//// -/SystemTimeImpl.java///1598217866//// -/InstallerPackageImpl.java///1638988032//// diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Extra.Old deleted file mode 100644 index bae498e70..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Extra.Old +++ /dev/null @@ -1,3 +0,0 @@ -/NativeServerSocketImpl.java///1543595951//// -/InstallerPackageImpl.java///1583630789//// -/SystemTimeImpl.java///1598217866//// diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Old b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Old deleted file mode 100644 index e4f85347d..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Entries.Old +++ /dev/null @@ -1,4 +0,0 @@ -/NativeServerSocketImpl.java/1.2/Fri Nov 30 07:14:04 2018// -/InstallerPackageImpl.java/1.3/Mon Mar 2 00:11:03 2020// -/SystemTimeImpl.java/1.1/Wed Jun 3 18:07:15 2020// -D diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Repository b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Repository deleted file mode 100644 index cabad2af4..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/javase/bridge diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Root b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/InstallerPackageImpl.java b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/InstallerPackageImpl.java deleted file mode 100644 index 6f7d2cf91..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/InstallerPackageImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import java.net.InetAddress; -import java.lang.Throwable; - -public class InstallerPackageImpl implements InstallerPackage -{ - public String getPackages() { - return null; - } - - public void setDrawers(boolean vis) - { - } - public String eval(String command) - { - - return "ok"; - } - - - public String getInstaller(String param) { - return null; - } - public String getHostName() - { try { - return(InetAddress.getLocalHost().getHostName()); - } catch (Throwable e) {}; - return(null); - } - - public boolean isSupported() { - return true; - } - public double getScreenDPI() { return(96.0); } - public String getOSInfo() { return("simulator"); } - public int getOrientation() { return(0); } - public int setOrientation(boolean portrait,boolean rev) { return(0); } - public String getLocalWifiIpAddress() { return("localhost"); } - public void hardExit() { - System.exit(0); - } -} diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/NativeServerSocketImpl.java b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/NativeServerSocketImpl.java deleted file mode 100644 index 3e86e557c..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/NativeServerSocketImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -import java.lang.Exception; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; -import java.util.Hashtable; -import java.net.ServerSocket; -/** - * this javase version of NativeServerSocket is essentially - * identical to the JavaSE version, which is in turn essentially - * identical to the plain java version. - * - * This implements server socket binding and an "accept" factory - * the key to it's success is that it also implements the raw I/O - * on the socket streams that the factory produces. - * - * @author Ddyer - * - */ -public class NativeServerSocketImpl implements bridge.NativeServerSocket -{ // - // native interfaces are restructed from returning objects, so instead - // it returns integers which act as handles for the underlying objects. - // - private HashtableobjectMap = new Hashtable(); - private HashtablereverseMap = new Hashtable(); - private int nextKey = 1000; - private Object find(int key) { return(objectMap.get(key)); } - private void forget(int key) { objectMap.remove(key); } - private int remember(Object something) - { int v = nextKey++; - objectMap.put(v,something); - return(v); - } - private int errorCode(String something) - { if(reverseMap.containsKey(something)) - { return reverseMap.get(something); - } - int v = -remember(something); - reverseMap.put(something, v); - return(v); - } - // - // native interfaces also can't throw errors, so errors are caught - // and their .toString() values are remembered. For general compatibility - // with i/o, values from -1 up are not errors. - // - public String getIOExceptionMessage(int handle) - { return ( (handle>-1) ? null : (String)(find(-handle))); - } - - // service for NativeOutputStream - public int write(int handle, int param1) { - try { - OutputStream o = (OutputStream)find(handle); - o.write(param1); - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int writeArray(int param, byte[] param1, int param2, int param3) - { try { - OutputStream stream = (OutputStream)find(param); - stream.write(param1,param2,param3); - return(0); - } catch (Exception e) - { return(errorCode(e.toString())); - } - } - - /* - * service for NativeInputStream - * - */ - public int read(int param) { - try { - InputStream s = (InputStream)find(param); - int val = s.read(); - return(val); - } - catch (Exception e) { return(errorCode(e.toString())); } - } - public int readArray(int param, byte[] param1, int param2, int param3) - { - try { - InputStream stream = (InputStream)find(param); - int v = stream.read(param1,param2,param3); - return(v); - }catch (Exception e) - { return(errorCode(e.toString())); - } - } - public int closeInput(int param) { - try { - InputStream stream = (InputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - public int closeSocket(int param) { - try { - Socket sock = (Socket)find(param); - if(sock!=null) { sock.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int closeOutput(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.close(); forget(param); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - public int flush(int param) { - try { - OutputStream stream = (OutputStream)find(param); - if(stream!=null) { stream.flush(); } - return(0); - } catch (Exception e) { return(errorCode(e.toString())); } - } - - /* - * service for bind and accept - */ - private boolean bound = false; - private ServerSocket serverSocket = null; - public int unBind() - { try { - if(bound) - { - bound = false; - serverSocket.close(); - serverSocket=null; - } - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int bindSocket(int param) - { bound = false; - try { - serverSocket = new ServerSocket(param); - bound = true; - return(0); - }catch (Exception e) { return(errorCode(e.toString())); } - } - public int listen() { - if(bound) - { - try { - Socket listenSocket = serverSocket.accept(); - return(listenSocket==null ? -1 : remember(listenSocket)); - } catch (Exception e) { return(errorCode(e.toString())); } - } - else { return(errorCode("socket not bound")); } - } - - // the listener calls listen, then - // gets these handles and uses them to create - // input and output streams - public int getOutputHandle(int handle) - { try { - { Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) - { - return(remember(listenSocket.getOutputStream())); - } - else { return(errorCode("invalid socket handle")); } - } - }catch (Exception e) { return(errorCode(e.toString())); } - } - - public int getInputHandle(int handle) { - try { - Socket listenSocket = (Socket)find(handle); - if(listenSocket!=null) { return(remember(listenSocket.getInputStream())); } - else { return(errorCode("invalid socket handle")); } - } - catch (Exception e) { return(errorCode(e.toString())); } - } - - - public boolean isSupported() { - return true; - } - - public int connect(String host, int port) { - try { - @SuppressWarnings("resource") - Socket listenSocket = new Socket(host, port); - if(listenSocket!=null) { return(remember(listenSocket)); } - } catch (Exception err) { errorCode(err.toString()); } - return(-1); - } -} diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/SystemTimeImpl.java b/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/SystemTimeImpl.java deleted file mode 100644 index 354bdcd1c..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/bridge/SystemTimeImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - Copyright 2006-2023 by Dave Dyer - - This file is part of the Boardspace project. - - Boardspace is free software: you can redistribute it and/or modify it under the terms of - the GNU General Public License as published by the Free Software Foundation, - either version 3 of the License, or (at your option) any later version. - - Boardspace is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with Boardspace. - If not, see https://www.gnu.org/licenses/. - */ -package bridge; - -public class SystemTimeImpl implements bridge.SystemTime{ - public long currentNanoTime() { - return System.nanoTime(); - } - - public boolean isSupported() { - return true; - } - -} diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries deleted file mode 100644 index 54700b8cc..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/UdpListenerImpl.java/1.5/Wed Dec 8 18:12:56 2021// -D diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Extra b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Extra deleted file mode 100644 index a776d6310..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Extra +++ /dev/null @@ -1 +0,0 @@ -/UdpListenerImpl.java///1638988011//// diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Extra.Old b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Extra.Old deleted file mode 100644 index 4798653ed..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Extra.Old +++ /dev/null @@ -1 +0,0 @@ -/UdpListenerImpl.java///1563235133//// diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Old b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Old deleted file mode 100644 index 2c275f1f7..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Entries.Old +++ /dev/null @@ -1,2 +0,0 @@ -/UdpListenerImpl.java/1.4/Mon Jul 15 23:58:53 2019// -D diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Repository b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Repository deleted file mode 100644 index 13a8563ae..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -boardspace-codename1/native/javase/udp diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Root b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Root deleted file mode 100644 index 5b1d44317..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:ddyer@localhost:f:\cvs\ddyer diff --git a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/UdpListenerImpl.java b/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/UdpListenerImpl.java deleted file mode 100644 index 4ad0fdf31..000000000 --- a/client/boardspace-maven/boardspacerelease/javase/src/main/java/udp/UdpListenerImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -package udp; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InterfaceAddress; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.util.Enumeration; -import java.util.Random; -import java.util.Vector; -import lib.Http; - -public class UdpListenerImpl implements udp.UdpListener{ - Vectormessages = new Vector(); - boolean exit=false; - String senderId = "S"+(new Random().nextLong()&0x7fffffffffL)+":"; - boolean filter = false; - public String getMessage(int wait) - { synchronized(this) - { if((wait>=0) && (messages.size()==0)) { try { wait(wait); } catch (InterruptedException e) {} } - } - if(messages.size()>0) { return(messages.remove(0)); } - return(null); - } - - DatagramSocket socket = null; - public VectormyIPAddresses = new Vector(); - public VectormyBroadcastAddresses = new Vector(); - - private void getAllInterfaces() - { - myBroadcastAddresses.clear(); - myIPAddresses.clear(); - - Enumeration interfaces; - try { - interfaces = NetworkInterface.getNetworkInterfaces(); - while (interfaces.hasMoreElements()) - { - NetworkInterface networkInterface = interfaces.nextElement(); - - if (networkInterface.isLoopback() || !networkInterface.isUp()) { - continue; // Don't want to broadcast to the loopback interface - } - - for (InterfaceAddress interfaceAddress : networkInterface.getInterfaceAddresses()) { - InetAddress broadcast = interfaceAddress.getBroadcast(); - InetAddress myAddress = interfaceAddress.getAddress(); - if(broadcast!=null) { myBroadcastAddresses.addElement(broadcast.getHostAddress()); } - if(myAddress!=null) { myIPAddresses.addElement(myAddress.getHostAddress()); } - }} - } catch (SocketException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - - public void runBroadcastReceiver( int broadcastPort,boolean fil) - { - try { - socket = new DatagramSocket(broadcastPort); - socket.setBroadcast(true); - filter = fil; - while(!exit) - { - DatagramPacket packet = new DatagramPacket(new byte[1000], 1000); - socket.receive(packet); - InetAddress ip = packet.getAddress(); - String host = ip.getHostAddress(); - String msg = new String(packet.getData(), packet.getOffset(), packet.getLength()); - if(filter && msg.charAt(0)=='S') - { if(!msg.startsWith(senderId)) - { - int dx = msg.indexOf(':'); - if(dx>0) { msg = msg.substring(dx+1); } - } - else { msg = null; } - } - if(msg!=null) - { - messages.add(host+":" + msg); - synchronized(this) { notifyAll(); } - } - - } - if(socket!=null) - { - socket.close(); - socket = null; - } - } - catch (IOException e) - { - messages.add("error: on receive: "+e); - - } - } - - private void broadcastOverAllInterfaces(DatagramSocket udpSocket ,String m,int broadcastPort) - throws IOException - { - byte[] msg = m.getBytes(); - - for(int i = 0;i7.0.55 + 7.0.130 - LATEST + 7.0.130 diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build Android Studio Project.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build Android Studio Project.launch deleted file mode 100644 index a86745ff1..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build Android Studio Project.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build JavaSE Desktop App.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build JavaSE Desktop App.launch deleted file mode 100644 index 5e7c5eaa8..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build JavaSE Desktop App.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build iOS Xcode Project.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build iOS Xcode Project.launch deleted file mode 100644 index 3db143c23..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Build iOS Xcode Project.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Debug Simulator.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Debug Simulator.launch deleted file mode 100644 index adcee2ec3..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Debug Simulator.launch +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Debug in Simulator.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Debug in Simulator.launch deleted file mode 100644 index 1514f2d3e..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Debug in Simulator.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Remote Debug Simulator.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Remote Debug Simulator.launch deleted file mode 100644 index ee0bf4fd7..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Remote Debug Simulator.launch +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Run Desktop.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Run Desktop.launch deleted file mode 100644 index 7f6183388..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Run Desktop.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Run Simulator.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Run Simulator.launch deleted file mode 100644 index f79d59790..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Run Simulator.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Android Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Android Build.launch deleted file mode 100644 index 46ecba931..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Android Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Javascript Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Javascript Build.launch deleted file mode 100644 index b2c7a158e..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Javascript Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Mac Desktop Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Mac Desktop Build.launch deleted file mode 100644 index 73ffd02f1..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Mac Desktop Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Windows Desktop Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Windows Desktop Build.launch deleted file mode 100644 index 29b6999da..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Windows Desktop Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Windows UWP Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Windows UWP Build.launch deleted file mode 100644 index f6a873eb0..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send Windows UWP Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send iOS Debug Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send iOS Debug Build.launch deleted file mode 100644 index b22dc4c29..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send iOS Debug Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send iOS Release Build.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send iOS Release Build.launch deleted file mode 100644 index b5d19c769..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Send iOS Release Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Update Codename One.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Update Codename One.launch deleted file mode 100644 index a7cf568e5..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease - Update Codename One.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease Settings.launch b/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease Settings.launch deleted file mode 100644 index a7932b840..000000000 --- a/client/boardspace-maven/boardspacerelease/tools/eclipse/BoardspaceRelease Settings.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/boardspacerelease/win/.classpath b/client/boardspace-maven/boardspacerelease/win/.classpath index ac74422ca..69efe408b 100644 --- a/client/boardspace-maven/boardspacerelease/win/.classpath +++ b/client/boardspace-maven/boardspacerelease/win/.classpath @@ -19,7 +19,7 @@ - + diff --git a/client/boardspace-maven/boardspacerelease/win/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (8).launch b/client/boardspace-maven/boardspacerelease/win/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (8).launch new file mode 100644 index 000000000..d8effef81 --- /dev/null +++ b/client/boardspace-maven/boardspacerelease/win/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (8).launch @@ -0,0 +1,7 @@ + + + + + + + diff --git a/client/boardspace-maven/boardspacerelease/win/.gitignore b/client/boardspace-maven/boardspacerelease/win/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/boardspacerelease/win/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/boardspacerelease/win/.project b/client/boardspace-maven/boardspacerelease/win/.project index 90defaacf..b27b8e519 100644 --- a/client/boardspace-maven/boardspacerelease/win/.project +++ b/client/boardspace-maven/boardspacerelease/win/.project @@ -11,8 +11,13 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder (8).launch + diff --git a/client/boardspace-maven/dtest/android/.classpath b/client/boardspace-maven/dtest/android/.classpath index 8f9ef0edb..6b3946a68 100644 --- a/client/boardspace-maven/dtest/android/.classpath +++ b/client/boardspace-maven/dtest/android/.classpath @@ -25,7 +25,7 @@ - + diff --git a/client/boardspace-maven/dtest/android/.gitignore b/client/boardspace-maven/dtest/android/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/dtest/android/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.core.prefs b/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.core.prefs index 2f5cc74c3..f23c556f9 100644 --- a/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.core.prefs +++ b/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,29 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter= +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.launching.prefs b/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.launching.prefs new file mode 100644 index 000000000..f8a131b56 --- /dev/null +++ b/client/boardspace-maven/dtest/android/.settings/org.eclipse.jdt.launching.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.launching.PREF_COMPILER_COMPLIANCE_DOES_NOT_MATCH_JRE=warning +org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=warning diff --git a/client/boardspace-maven/dtest/common/.classpath b/client/boardspace-maven/dtest/common/.classpath index 13f70d34d..6d619b327 100644 --- a/client/boardspace-maven/dtest/common/.classpath +++ b/client/boardspace-maven/dtest/common/.classpath @@ -13,7 +13,7 @@ - + diff --git a/client/boardspace-maven/dtest/common/.gitignore b/client/boardspace-maven/dtest/common/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/dtest/common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/dtest/common/codenameone_settings.properties b/client/boardspace-maven/dtest/common/codenameone_settings.properties index 6c29fb49f..49c2e645e 100644 --- a/client/boardspace-maven/dtest/common/codenameone_settings.properties +++ b/client/boardspace-maven/dtest/common/codenameone_settings.properties @@ -7,21 +7,21 @@ codename1.arg.java.version=8 codename1.cssTheme=true codename1.displayName=Dtest codename1.icon=icon.png -codename1.ios.appid=Q5GHSKAL2F.com.boardspace +codename1.ios.appid=N9ZJLP5456.com.boardspace codename1.ios.certificate= codename1.ios.certificatePassword= -codename1.ios.debug.certificate= -codename1.ios.debug.certificatePassword= -codename1.ios.debug.provision= +codename1.ios.debug.certificate=G\:\\share\\projects\\boardspace-maven\\dtest\\common\\iosCerts\\development_certificate.p12 +codename1.ios.debug.certificatePassword=G51uJi3G +codename1.ios.debug.provision=G\:\\share\\projects\\boardspace-maven\\dtest\\common\\iosCerts\\development_provisioning_profile.mobileprovision codename1.ios.provision= -codename1.ios.release.certificate= -codename1.ios.release.certificatePassword= -codename1.ios.release.provision= +codename1.ios.release.certificate=G\:\\share\\projects\\boardspace-maven\\dtest\\common\\iosCerts\\appstore_certificate.p12 +codename1.ios.release.certificatePassword=ItmhG0i2 +codename1.ios.release.provision=G\:\\share\\projects\\boardspace-maven\\dtest\\common\\iosCerts\\production_provisioning_profile.mobileprovision codename1.j2me.nativeTheme=nbproject/nativej2me.res codename1.kotlin=false codename1.languageLevel=5 codename1.mainName=Dtest -codename1.packageName=com.boardspace +codename1.packageName=dtest.boardspace codename1.rim.certificatePassword= codename1.rim.signtoolCsk= codename1.rim.signtoolDb= diff --git a/client/boardspace-maven/dtest/common/iosCerts/appstore_certificate.p12 b/client/boardspace-maven/dtest/common/iosCerts/appstore_certificate.p12 new file mode 100644 index 000000000..460bab54c Binary files /dev/null and b/client/boardspace-maven/dtest/common/iosCerts/appstore_certificate.p12 differ diff --git a/client/boardspace-maven/dtest/common/iosCerts/development_certificate.p12 b/client/boardspace-maven/dtest/common/iosCerts/development_certificate.p12 new file mode 100644 index 000000000..c39b39a54 Binary files /dev/null and b/client/boardspace-maven/dtest/common/iosCerts/development_certificate.p12 differ diff --git a/client/boardspace-maven/dtest/common/iosCerts/development_provisioning_profile.mobileprovision b/client/boardspace-maven/dtest/common/iosCerts/development_provisioning_profile.mobileprovision new file mode 100644 index 000000000..048cea0a2 Binary files /dev/null and b/client/boardspace-maven/dtest/common/iosCerts/development_provisioning_profile.mobileprovision differ diff --git a/client/boardspace-maven/dtest/common/iosCerts/production_provisioning_profile.mobileprovision b/client/boardspace-maven/dtest/common/iosCerts/production_provisioning_profile.mobileprovision new file mode 100644 index 000000000..d825e0bc6 Binary files /dev/null and b/client/boardspace-maven/dtest/common/iosCerts/production_provisioning_profile.mobileprovision differ diff --git a/client/boardspace-maven/dtest/common/src/main/java/com/boardspace/Dtest.java b/client/boardspace-maven/dtest/common/src/main/java/dtest/boardspace/Dtest.java similarity index 99% rename from client/boardspace-maven/dtest/common/src/main/java/com/boardspace/Dtest.java rename to client/boardspace-maven/dtest/common/src/main/java/dtest/boardspace/Dtest.java index 751645f91..ee63815ea 100644 --- a/client/boardspace-maven/dtest/common/src/main/java/com/boardspace/Dtest.java +++ b/client/boardspace-maven/dtest/common/src/main/java/dtest/boardspace/Dtest.java @@ -1,4 +1,4 @@ -package com.boardspace; +package dtest.boardspace; import com.codename1.ui.Command; import com.codename1.ui.Component; diff --git a/client/boardspace-maven/dtest/common/src/main/java/com/boardspace/Dtest.xjava b/client/boardspace-maven/dtest/common/src/main/java/dtest/boardspace/Dtest.xjava similarity index 100% rename from client/boardspace-maven/dtest/common/src/main/java/com/boardspace/Dtest.xjava rename to client/boardspace-maven/dtest/common/src/main/java/dtest/boardspace/Dtest.xjava diff --git a/client/boardspace-maven/dtest/ios/.classpath b/client/boardspace-maven/dtest/ios/.classpath index ec8625fe9..eddccc6a7 100644 --- a/client/boardspace-maven/dtest/ios/.classpath +++ b/client/boardspace-maven/dtest/ios/.classpath @@ -25,7 +25,7 @@ - + diff --git a/client/boardspace-maven/dtest/ios/.gitignore b/client/boardspace-maven/dtest/ios/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/dtest/ios/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/dtest/javascript/.classpath b/client/boardspace-maven/dtest/javascript/.classpath index acf707c54..65cef933e 100644 --- a/client/boardspace-maven/dtest/javascript/.classpath +++ b/client/boardspace-maven/dtest/javascript/.classpath @@ -25,7 +25,7 @@ - + diff --git a/client/boardspace-maven/dtest/javascript/.gitignore b/client/boardspace-maven/dtest/javascript/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/dtest/javascript/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/dtest/javascript/target/classes/META-INF/MANIFEST.MF b/client/boardspace-maven/dtest/javascript/target/classes/META-INF/MANIFEST.MF new file mode 100644 index 000000000..9bdf3b1f3 --- /dev/null +++ b/client/boardspace-maven/dtest/javascript/target/classes/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Build-Jdk-Spec: 21 +Created-By: Maven Integration for Eclipse + diff --git a/client/boardspace-maven/dtest/javascript/target/classes/META-INF/maven/com.boardspace/dtest-javascript/pom.properties b/client/boardspace-maven/dtest/javascript/target/classes/META-INF/maven/com.boardspace/dtest-javascript/pom.properties new file mode 100644 index 000000000..80a42f3b8 --- /dev/null +++ b/client/boardspace-maven/dtest/javascript/target/classes/META-INF/maven/com.boardspace/dtest-javascript/pom.properties @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Wed Dec 06 12:51:23 PST 2023 +artifactId=dtest-javascript +groupId=com.boardspace +m2e.projectLocation=G\:\\share\\projects\\boardspace-maven\\dtest\\javascript +m2e.projectName=dtest-javascript +version=1.0-SNAPSHOT diff --git a/client/boardspace-maven/dtest/javascript/target/classes/META-INF/maven/com.boardspace/dtest-javascript/pom.xml b/client/boardspace-maven/dtest/javascript/target/classes/META-INF/maven/com.boardspace/dtest-javascript/pom.xml new file mode 100644 index 000000000..96b1d1d9a --- /dev/null +++ b/client/boardspace-maven/dtest/javascript/target/classes/META-INF/maven/com.boardspace/dtest-javascript/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + com.boardspace + dtest + 1.0-SNAPSHOT + + com.boardspace + dtest-javascript + 1.0-SNAPSHOT + + dtest-javascript + + + UTF-8 + 1.8 + 1.8 + javascript + javascript + javascript + + + + + src/main/javascript + + + src/main/resources + + + + + com.codenameone + codenameone-maven-plugin + ${cn1.plugin.version} + + + build-javascript + package + + build + + + + + + + + + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + tests + test + + + + + + + + + diff --git a/client/boardspace-maven/dtest/javase/.classpath b/client/boardspace-maven/dtest/javase/.classpath index a138ec619..cf3d94101 100644 --- a/client/boardspace-maven/dtest/javase/.classpath +++ b/client/boardspace-maven/dtest/javase/.classpath @@ -19,7 +19,7 @@ - + diff --git a/client/boardspace-maven/dtest/javase/.gitignore b/client/boardspace-maven/dtest/javase/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/dtest/javase/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/client/boardspace-maven/dtest/javase/target/classes/META-INF/MANIFEST.MF b/client/boardspace-maven/dtest/javase/target/classes/META-INF/MANIFEST.MF new file mode 100644 index 000000000..9bdf3b1f3 --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/classes/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Build-Jdk-Spec: 21 +Created-By: Maven Integration for Eclipse + diff --git a/client/boardspace-maven/dtest/javase/target/classes/META-INF/maven/com.boardspace/dtest-javase/pom.properties b/client/boardspace-maven/dtest/javase/target/classes/META-INF/maven/com.boardspace/dtest-javase/pom.properties new file mode 100644 index 000000000..eb4d3ac3a --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/classes/META-INF/maven/com.boardspace/dtest-javase/pom.properties @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Wed Dec 06 12:51:23 PST 2023 +artifactId=dtest-javase +groupId=com.boardspace +m2e.projectLocation=G\:\\share\\projects\\boardspace-maven\\dtest\\javase +m2e.projectName=dtest-javase +version=1.0-SNAPSHOT diff --git a/client/boardspace-maven/dtest/javase/target/classes/META-INF/maven/com.boardspace/dtest-javase/pom.xml b/client/boardspace-maven/dtest/javase/target/classes/META-INF/maven/com.boardspace/dtest-javase/pom.xml new file mode 100644 index 000000000..147b2041b --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/classes/META-INF/maven/com.boardspace/dtest-javase/pom.xml @@ -0,0 +1,829 @@ + + + 4.0.0 + + com.boardspace + dtest + 1.0-SNAPSHOT + + com.boardspace + dtest-javase + 1.0-SNAPSHOT + + dtest-javase + + + UTF-8 + 1.8 + 1.8 + javase + javase + + + ${project.basedir}/../common/src/test/java + + + codenameone-maven-plugin + com.codenameone + ${cn1.plugin.version} + + + add-se-sources + + generate-javase-sources + + generate-sources + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + com.codenameone + + + codenameone-maven-plugin + + + [7.0.55,) + + + + generate-javase-sources + + + + + + + + + + + + + + + + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + + + ${project.groupId} + ${cn1app.name}-common + ${project.version} + tests + test + + + com.codenameone + codenameone-core + test + + + com.codenameone + codenameone-core + provided + + + com.codenameone + codenameone-javase + test + + + com.codenameone + codenameone-javase + provided + + + + + + + + executable-jar + + javase + com.boardspace.DtestStub + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + src/main/resources + src/desktop/resources + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/../common/codenameone_settings.properties + + + + + + + com.codenameone + codenameone-maven-plugin + + + generate-icons + generate-sources + + generate-desktop-app-wrapper + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + + ${project.build.directory}/libs + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + + ${codename1.packageName}.${codename1.mainName}Stub + + + + + + + maven-antrun-plugin + 3.0.0 + + + generate-javase-zip + package + + + + + + + + + + + + + + + + + run + + + + + + + + + + + run-desktop + + javase + com.boardspace.DtestStub + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + src/main/resources + src/desktop/resources + + + + com.codenameone + codenameone-maven-plugin + + + generate-icons + generate-sources + + generate-desktop-app-wrapper + + + + + + org.codehaus.mojo + exec-maven-plugin + + + run-desktop + verify + + java + + + + + + + + + + desktop_build + + + codename1.buildTarget + + + + + com.codenameone + codenameone-core + provided + + + com.codenameone + codenameone-javase + provided + + + + + + + com.codenameone + codenameone-maven-plugin + ${cn1.plugin.version} + + + build-desktop-macosx + package + + build + + + + + + + + + + + test + + + !skipTests + + + + javase + com.codename1.impl.javase.Simulator + + + + com.codenameone + codenameone-core + compile + + + + com.codenameone + codenameone-javase + compile + + + + + + com.codenameone + codenameone-maven-plugin + + + + + cn1-tests + test + + test + + + + + + + + + + + + debug-simulator + + javase + com.codename1.impl.javase.Simulator + true + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + + -Xdebug + -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} + -Xmx1024M + -Xmx1024M + + + + + -Dcef.dir=${cef.dir} + + + -Dcodename1.designer.jar=${codename1.designer.jar} + + + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + + + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + + + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + + debug-eclipse + + javase + com.codename1.impl.javase.Simulator + true + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + + -Xdebug + -Xrunjdwp:transport=dt_socket,server=y,address=${jpda.address},suspend=y + -Xmx1024M + -Xmx1024M + + + + + -Dcef.dir=${cef.dir} + + + -Dcodename1.designer.jar=${codename1.designer.jar} + + + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + + + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + + + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + simulator + + javase + com.codename1.impl.javase.Simulator + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + ${basedir}/../common + + java + true + + -XX:MaxPermSize=128M + -Xmx1024M + + + -Dcef.dir=${cef.dir} + + + -Dcodename1.designer.jar=${codename1.designer.jar} + + + -Dcodename1.css.compiler.args.input=${codename1.css.compiler.args.input} + + + -Dcodename1.css.compiler.args.output=${codename1.css.compiler.args.output} + + + -Dcodename1.css.compiler.args.merge=${codename1.css.compiler.args.merge} + ${codename1.exec.args.debug} + ${codename1.exec.args.runjdwp.transport} + -classpath + + ${exec.mainClass} + ${codename1.mainClass} + + + + + run-in-simulator + verify + + exec + + + + + + + + + + idea-simulator + + javase + com.codename1.impl.javase.Simulator + true + + + + com.codenameone + codenameone-core + compile + + + com.codenameone + codenameone-javase + compile + + + + + + + com.codenameone + codenameone-maven-plugin + + + prepare-simulator-environment + initialize + + + prepare-simulator-classpath + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + ${basedir}/../common + + true + + ${codename1.mainClass} + + + + + + cef.dir + ${cef.dir} + + + + codename1.designer.jar + ${codename1.designer.jar} + + + + codename1.css.compiler.args.input + ${codename1.css.compiler.args.input} + + + + codename1.css.compiler.args.output + ${codename1.css.compiler.args.output} + + + + codename1.css.compiler.args.merge + ${codename1.css.compiler.args.merge} + + + + + cn1.class.path + ${cn1.class.path} + + + + + + + + run-in-simulator-idea + verify + + java + + + + + + + + + + + + diff --git a/client/boardspace-maven/dtest/javase/target/dtest-javase-1.0-SNAPSHOT.jar b/client/boardspace-maven/dtest/javase/target/dtest-javase-1.0-SNAPSHOT.jar new file mode 100644 index 000000000..c13dd7a3d Binary files /dev/null and b/client/boardspace-maven/dtest/javase/target/dtest-javase-1.0-SNAPSHOT.jar differ diff --git a/client/boardspace-maven/dtest/javase/target/maven-archiver/pom.properties b/client/boardspace-maven/dtest/javase/target/maven-archiver/pom.properties new file mode 100644 index 000000000..2c8c23b6d --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=dtest-javase +groupId=com.boardspace +version=1.0-SNAPSHOT diff --git a/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 000000000..e69de29bb diff --git a/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 000000000..93ae70f1e --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com\boardspace\MyFirstTest.class diff --git a/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 000000000..2ae40f49c --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +G:\share\projects\boardspace-maven\dtest\javase\..\common\src\test\java\com\boardspace\MyFirstTest.java diff --git a/client/boardspace-maven/dtest/javase/target/surefire-reports/2023-12-05T17-40-45_567.dumpstream b/client/boardspace-maven/dtest/javase/target/surefire-reports/2023-12-05T17-40-45_567.dumpstream new file mode 100644 index 000000000..6fabdacf9 --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/surefire-reports/2023-12-05T17-40-45_567.dumpstream @@ -0,0 +1,4 @@ +# Created at 2023-12-05T17:40:48.018 +Boot Manifest-JAR contains absolute paths in classpath 'G:\share\projects\boardspace-maven\dtest\javase\target\test-classes' +Hint: -Djdk.net.URLClassPath.disableClassPathURLCheck=true + diff --git a/client/boardspace-maven/dtest/javase/target/surefire-reports/TEST-com.boardspace.MyFirstTest.xml b/client/boardspace-maven/dtest/javase/target/surefire-reports/TEST-com.boardspace.MyFirstTest.xml new file mode 100644 index 000000000..3e85a48db --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/surefire-reports/TEST-com.boardspace.MyFirstTest.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/boardspace-maven/dtest/javase/target/surefire-reports/com.boardspace.MyFirstTest.txt b/client/boardspace-maven/dtest/javase/target/surefire-reports/com.boardspace.MyFirstTest.txt new file mode 100644 index 000000000..e5a2684c5 --- /dev/null +++ b/client/boardspace-maven/dtest/javase/target/surefire-reports/com.boardspace.MyFirstTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.boardspace.MyFirstTest +------------------------------------------------------------------------------- +Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s - in com.boardspace.MyFirstTest diff --git a/client/boardspace-maven/dtest/javase/target/test-classes/com/boardspace/MyFirstTest.class b/client/boardspace-maven/dtest/javase/target/test-classes/com/boardspace/MyFirstTest.class new file mode 100644 index 000000000..3f30fa622 Binary files /dev/null and b/client/boardspace-maven/dtest/javase/target/test-classes/com/boardspace/MyFirstTest.class differ diff --git a/client/boardspace-maven/dtest/javase/target/test-classes/tests.dat b/client/boardspace-maven/dtest/javase/target/test-classes/tests.dat new file mode 100644 index 000000000..f376bc6f9 Binary files /dev/null and b/client/boardspace-maven/dtest/javase/target/test-classes/tests.dat differ diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build Android Studio Project.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build Android Studio Project.launch deleted file mode 100644 index b38c5bdd3..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build Android Studio Project.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build JavaSE Desktop App.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build JavaSE Desktop App.launch deleted file mode 100644 index 9cf2167ce..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build JavaSE Desktop App.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build iOS Xcode Project.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build iOS Xcode Project.launch deleted file mode 100644 index df47d4c23..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Build iOS Xcode Project.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Debug Simulator.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Debug Simulator.launch deleted file mode 100644 index 1749b14ac..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Debug Simulator.launch +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Debug in Simulator.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Debug in Simulator.launch deleted file mode 100644 index 8a5431193..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Debug in Simulator.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Remote Debug Simulator.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Remote Debug Simulator.launch deleted file mode 100644 index 48f8b27fd..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Remote Debug Simulator.launch +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Run Desktop.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Run Desktop.launch deleted file mode 100644 index 161a2fe04..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Run Desktop.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Run Simulator.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Run Simulator.launch deleted file mode 100644 index bdfa7ac01..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Run Simulator.launch +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Android Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Android Build.launch deleted file mode 100644 index 1ad1afc0a..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Android Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Javascript Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Javascript Build.launch deleted file mode 100644 index 9a71f4b7e..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Javascript Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Mac Desktop Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Mac Desktop Build.launch deleted file mode 100644 index 51f600eef..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Mac Desktop Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Windows Desktop Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Windows Desktop Build.launch deleted file mode 100644 index 21355413a..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Windows Desktop Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Windows UWP Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Windows UWP Build.launch deleted file mode 100644 index 07aed17d0..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send Windows UWP Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send iOS Debug Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send iOS Debug Build.launch deleted file mode 100644 index 44ff0fdef..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send iOS Debug Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send iOS Release Build.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send iOS Release Build.launch deleted file mode 100644 index 6e9957639..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Send iOS Release Build.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Update Codename One.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest - Update Codename One.launch deleted file mode 100644 index 7ecf12d38..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest - Update Codename One.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/tools/eclipse/Dtest Settings.launch b/client/boardspace-maven/dtest/tools/eclipse/Dtest Settings.launch deleted file mode 100644 index 262c7c425..000000000 --- a/client/boardspace-maven/dtest/tools/eclipse/Dtest Settings.launch +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/boardspace-maven/dtest/win/.classpath b/client/boardspace-maven/dtest/win/.classpath index ac74422ca..a5d95095c 100644 --- a/client/boardspace-maven/dtest/win/.classpath +++ b/client/boardspace-maven/dtest/win/.classpath @@ -9,7 +9,6 @@ - @@ -19,7 +18,7 @@ - + @@ -29,12 +28,5 @@ - - - - - - - diff --git a/client/boardspace-maven/dtest/win/.gitignore b/client/boardspace-maven/dtest/win/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/client/boardspace-maven/dtest/win/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/