From f1cb4443aede6d4657bdc3396c8914d3a9f4fa93 Mon Sep 17 00:00:00 2001
From: Alejandro Acuña <alejandro.acuna@aluvisagrupo.com>
Date: Mon, 11 Nov 2024 13:09:35 +0000
Subject: [PATCH] bck
---
libraries/server/src/art/servers/Server.java | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/libraries/server/src/art/servers/Server.java b/libraries/server/src/art/servers/Server.java
index 551ebba..e2af07d 100644
--- a/libraries/server/src/art/servers/Server.java
+++ b/libraries/server/src/art/servers/Server.java
@@ -23,10 +23,14 @@
import art.servers.controller.ControllerStatus;
import art.servers.controller.ControllerTransactions;
import art.servers.controller.ControllerUserPermissions;
+import art.servers.gui.ArticWindow;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.io.File;
+import java.io.FileOutputStream;
import java.net.InetAddress;
import java.security.cert.X509Certificate;
import java.util.Properties;
@@ -50,7 +54,6 @@
public static void preinitialise(String[] args, Class configurationClass) throws Exception
{
-
Shared.debug = existParameter(args, "-debug");
Shared.reloadDevices = existParameter(args, "--reload");
Shared.restoreDevices = existParameter(args, "--restore");
@@ -112,41 +115,41 @@
System.setProperties(properties);
}
-
+
// License
boolean license = true;
-// if (existParameter(args, "-code") == true)
-// {
-// license = getParameter(args, "-code").equals(Shared.getApplicationCode());
-// }
-//
-//
-// if (existParameter(args, "--license") == true)
-// {
-// String password = getParameter(args, "--license");
-//
-// if (password.equalsIgnoreCase("¡¡register!!") == true)
-// {
-// FileOutputStream fos = new FileOutputStream(new File(Shared.getApplicationName() + ".license"));
-// fos.write(Licence.licenceGeneration(Licence.codeGeneration(Shared.getApplicationCode())).getBytes());
-// fos.close();
-// }
-// }
-//
-// if (license == false)
-// {
-// if (Licence.hasLicence(Shared.getApplicationCode(), new File(Shared.getApplicationName() + ".license")) == false)
-// {
-// codeGeneration();
-// }
-// }
+ if (existParameter(args, "-code") == true)
+ {
+ license = getParameter(args, "-code").equals(Shared.getApplicationCode());
+ }
+
+
+ if (existParameter(args, "--license") == true)
+ {
+ String password = getParameter(args, "--license");
+
+ if ((password.equalsIgnoreCase("¡¡register!!") == true) || (password.equalsIgnoreCase("**register**") == true))
+ {
+ FileOutputStream fos = new FileOutputStream(new File(Shared.getApplicationName() + ".license"));
+ fos.write(Licence.licenceGeneration(Licence.codeGeneration(Shared.getApplicationCode())).getBytes());
+ fos.close();
+ }
+ }
+
+ if (license == false)
+ {
+ if (Licence.hasLicence(Shared.getApplicationCode(), new File(Shared.getApplicationName() + ".license")) == false)
+ {
+ codeGeneration();
+ }
+ }
// User and password database desencryption
-
+
if (Shared.configuration.database != null)
{
for (PersistenceDatabaseParameters parameters : Shared.configuration.database)
@@ -155,6 +158,8 @@
parameters.password = Licence.decrypt(parameters.password);
}
}
+
+
// Application device, status
Application application = new Application(Shared.configuration.application);
@@ -199,13 +204,14 @@
}
else
{
+ System.out.println(Shared.getMessage("Process %1 already opened").replace("%1", Shared.configuration.general.executableName));
}
System.exit(0);
}
}
}
-
+
// Controller database
@@ -223,7 +229,7 @@
Shared.controllerProcessInformation = new ControllerProcessInformation();
-
+
// Controller transactions
@@ -233,6 +239,7 @@
Shared.lcontroller.add(Shared.controllerTransactions);
}
+
// Controller NTP HTTP
if (Shared.configuration.controllerNTPHTTP != null)
@@ -241,20 +248,25 @@
Shared.lcontroller.add(Shared.controllerNtpHttp);
}
- }public static void postinitialise(String[] args) throws Exception
+ }
+
+
+
+
+ public static void postinitialise(String[] args) throws Exception
{
// Graphical interface
-// if (existParameter(args, "-nogui") == false)
-// {
-// GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
-// int screenWidth = gd.getDisplayMode().getWidth();
-// int screenHeight = gd.getDisplayMode().getHeight();
-// Shared.window = new ArticWindow();
-// Shared.window.setLocation(Shared.configuration.general.windowX, Shared.configuration.general.windowY);
-// Shared.window.setSize(Math.min(Shared.configuration.general.windowW, screenWidth), Math.min(Shared.configuration.general.windowH, screenHeight));
-// }
+ if (existParameter(args, "-nogui") == false)
+ {
+ GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+ int screenWidth = gd.getDisplayMode().getWidth();
+ int screenHeight = gd.getDisplayMode().getHeight();
+ Shared.window = new ArticWindow();
+ Shared.window.setLocation(Shared.configuration.general.windowX, Shared.configuration.general.windowY);
+ Shared.window.setSize(Math.min(Shared.configuration.general.windowW, screenWidth), Math.min(Shared.configuration.general.windowH, screenHeight));
+ }
// Controller listener aluvisa
@@ -319,6 +331,7 @@
// Version
+ System.out.println(Shared.getApplicationName() + ", version " + Shared.version());
Shared.printVersion("art.library.adf", "adf.version.properties");
Shared.printVersion("art.library.andigo", "andigo.version.properties");
Shared.printVersion("art.library.flatgui", "flatgui.version.properties");
@@ -388,6 +401,7 @@
clpbrd.setContents(stringSelection, null);
String message = Shared.getMessage("Copy below code and send to provider to activate product");
message = message + "\n\n" + code + "\n\n";
+ System.out.println(message);
FlatDialog.showDialog(null, Shared.getMessage("License code"), message, true, FlatDialog.DIALOG_INFORMATION);
}
catch (Exception e)
@@ -397,6 +411,7 @@
String message = Shared.getMessage("Error in licence generation");
message = message + "\n";
message = message + Shared.getMessage("Contact provider to solve the problem");
+ System.out.println(message);
FlatDialog.showDialog(null, Shared.getMessage("Error"), message, true, FlatDialog.DIALOG_ERROR);
}
catch (Exception exception)
--
Gitblit v1.10.0