unicenta-base/unicenta-opos
3
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

merge into: unicenta-base/unicenta-opos:UOCL-315-efr
Branches Tags
unicenta-base/unicenta-opos:main unicenta-base/unicenta-opos:5.5.0-development unicenta-base/unicenta-opos:debugging unicenta-base/unicenta-opos:UOCL-315-efr-attempt-2 unicenta-base/unicenta-opos:UOCL-315-efr unicenta-base/unicenta-opos:5.x-web unicenta-base/unicenta-opos:5.3.2 unicenta-base/unicenta-opos:java-17 unicenta-base/unicenta-opos:order-api unicenta-base/unicenta-opos:teya-integration unicenta-base/unicenta-opos:customer-api
unicenta-base/unicenta-opos:5.4.0-web unicenta-base/unicenta-opos:5.4.0 unicenta-base/unicenta-opos:5.3 unicenta-base/unicenta-opos:5.2 unicenta-base/unicenta-opos:5.0.1 unicenta-base/unicenta-opos:5.0
...
pull from: unicenta-base/unicenta-opos:java-17
Branches Tags
unicenta-base/unicenta-opos:main unicenta-base/unicenta-opos:5.5.0-development unicenta-base/unicenta-opos:debugging unicenta-base/unicenta-opos:UOCL-315-efr-attempt-2 unicenta-base/unicenta-opos:UOCL-315-efr unicenta-base/unicenta-opos:5.x-web unicenta-base/unicenta-opos:5.3.2 unicenta-base/unicenta-opos:java-17 unicenta-base/unicenta-opos:order-api unicenta-base/unicenta-opos:teya-integration unicenta-base/unicenta-opos:customer-api
unicenta-base/unicenta-opos:5.4.0-web unicenta-base/unicenta-opos:5.4.0 unicenta-base/unicenta-opos:5.3 unicenta-base/unicenta-opos:5.2 unicenta-base/unicenta-opos:5.0.1 unicenta-base/unicenta-opos:5.0

1 Commits
UOCL-315-efr ... java-17

Author SHA1 Message Date
hugh b1749248cf jvm 17 wip 2024-04-10 11:16:27 +01:00
4 changed files with 61 additions and 46 deletions
Expand all files Collapse all files
pom.xml
+19 -5
View File
@@ -302,7 +302,7 @@
<artifactId>reflections</artifactId>
<version>0.9.12</version>
</dependency>
<!-- https://mvnrepository.com/artifact/de.sciss/weblaf -->
<!-- https://mvnrepository.com/artifact/de.sciss/weblaf
<dependency>
<groupId>de.sciss</groupId>
<artifactId>weblaf</artifactId>
@@ -321,11 +321,26 @@
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>-->
<dependency>
<groupId>com.unicenta</groupId>
<artifactId>unicenta-plugins</artifactId>
<version>1.2.6</version>
<exclusions>
<exclusion>
<groupId>de.sciss</groupId>
<artifactId>weblaf</artifactId>
</exclusion>
<exclusion>
<groupId>de.sciss</groupId>
<artifactId>weblaf-core</artifactId>
</exclusion>
<exclusion>
<groupId>de.sciss</groupId>
<artifactId>weblaf-ui</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.gluonhq</groupId>
@@ -386,10 +401,9 @@
<version>9.4.1208</version>
</dependency>
<dependency>
<groupId>de.sciss</groupId>
<groupId>com.weblookandfeel</groupId>
<artifactId>weblaf-ui</artifactId>
<version>2.1.3</version>
<type>jar</type>
<version>1.2.14</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
src/main/java/com/unicenta/pos/config/JPanelConfigPeripheral.java
+1 -1
View File
@@ -1961,7 +1961,7 @@ public class JPanelConfigPeripheral extends javax.swing.JPanel implements PanelC
webSlider.setSnapToTicks(true);
webSlider.setToolTipText("");
webSlider.setValue(5);
webSlider.setAnimated(false);
//webSlider.setAnimated(false);
webSlider.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
webSlider.setPreferredSize(new java.awt.Dimension(270, 47));
webSlider.addChangeListener(new javax.swing.event.ChangeListener() {
src/main/java/com/unicenta/pos/forms/JRootApp.java
+26 -25
View File
@@ -19,6 +19,7 @@
package com.unicenta.pos.forms;
//import com.alee.extended.statusbar.WebMemoryBar;
import com.dalsemi.onewire.OneWireAccessProvider;
import com.dalsemi.onewire.OneWireException;
import com.dalsemi.onewire.adapter.DSPortAdapter;
@@ -194,8 +195,8 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
initComponents();
jScrollPane1.getVerticalScrollBar().setPreferredSize(new Dimension(30, 30));
serverMonitor.setVisible(false);
webMemoryBar1.setShowMaximumMemory(true);
//serverMonitor.setVisible(false);
//webMemoryBar1.setShowMaximumMemory(true);
}
private DSPortAdapter m_oneWireAdapter;
@@ -935,7 +936,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
}
private int getProgressBar() {
int rate = serverMonitor.getValue();
int rate = 1;
return rate;
}
@@ -944,7 +945,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
* This method is for the future. Connects and will include both servers + backup server
* Tested locally on JG machine and unicenta-server
*/
serverMonitor.setString("Checking...");
//serverMonitor.setString("Checking...");
InetAddress addr = InetAddress.getByName(AppLocal.getIntString("db.ip"));
int port = 3306;
@@ -953,8 +954,8 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
Socket sock = new Socket();
try {
sock.connect(sockaddr, 2000);
serverMonitor.setString("Server is alive!");
serverMonitor.setValue(0);
//serverMonitor.setString("Server is alive!");
//serverMonitor.setValue(0);
return true;
} catch (IOException ex) {
log.error(ex.getMessage());
@@ -991,8 +992,8 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
m_jPanelDown = new javax.swing.JPanel();
panelTask = new javax.swing.JPanel();
m_jHost = new javax.swing.JLabel();
webMemoryBar1 = new com.alee.extended.statusbar.WebMemoryBar();
serverMonitor = new com.alee.laf.progressbar.WebProgressBar();
//webMemoryBar1 = new com.alee.extended.statusbar.WebMemoryBar();
serverMonitor = null;
jPanel3 = new javax.swing.JPanel();
setEnabled(false);
@@ -1152,23 +1153,23 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
m_jHost.setText("*Hostname");
panelTask.add(m_jHost);
webMemoryBar1.setBackground(new java.awt.Color(153, 153, 153));
webMemoryBar1.setText("");
webMemoryBar1.setFont(new java.awt.Font("Arial", 0, 11)); // NOI18N
webMemoryBar1.setPreferredSize(new java.awt.Dimension(150, 30));
webMemoryBar1.setUsedBorderColor(new java.awt.Color(0, 204, 204));
webMemoryBar1.setUsedFillColor(new java.awt.Color(0, 204, 255));
panelTask.add(webMemoryBar1);
//webMemoryBar1.setBackground(new java.awt.Color(153, 153, 153));
//webMemoryBar1.setText("");
//webMemoryBar1.setFont(new java.awt.Font("Arial", 0, 11)); // NOI18N
//webMemoryBar1.setPreferredSize(new java.awt.Dimension(150, 30));
//webMemoryBar1.setUsedBorderColor(new java.awt.Color(0, 204, 204));
//webMemoryBar1.setUsedFillColor(new java.awt.Color(0, 204, 255));
//panelTask.add(webMemoryBar1);
serverMonitor.setToolTipText("");
serverMonitor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
serverMonitor.setMaximumSize(new java.awt.Dimension(50, 18));
serverMonitor.setPreferredSize(new java.awt.Dimension(150, 30));
serverMonitor.setProgressBottomColor(new java.awt.Color(76, 197, 237));
serverMonitor.setRound(2);
serverMonitor.setString("Keep Alive");
serverMonitor.setStringPainted(true);
panelTask.add(serverMonitor);
//serverMonitor.setToolTipText("");
//serverMonitor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
//serverMonitor.setMaximumSize(new java.awt.Dimension(50, 18));
//serverMonitor.setPreferredSize(new java.awt.Dimension(150, 30));
//serverMonitor.setProgressBottomColor(new java.awt.Color(76, 197, 237));
//serverMonitor.setRound(2);
//serverMonitor.setString("Keep Alive");
//serverMonitor.setStringPainted(true);
//panelTask.add(serverMonitor);
m_jPanelDown.add(panelTask, java.awt.BorderLayout.LINE_START);
m_jPanelDown.add(jPanel3, java.awt.BorderLayout.LINE_END);
@@ -1212,6 +1213,6 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
private javax.swing.JPanel panelTask;
private javax.swing.JLabel poweredby;
private com.alee.laf.progressbar.WebProgressBar serverMonitor;
private com.alee.extended.statusbar.WebMemoryBar webMemoryBar1;
//private com.alee.extended.statusbar.WebMemoryBar webMemoryBar1;
// End of variables declaration//GEN-END:variables
}
src/main/java/com/unicenta/pos/transfer/Transfer.java
+15 -15
View File
@@ -283,7 +283,7 @@ public final class Transfer extends JPanel implements JPanelView {
try {
txtOut.append("Adding Foreign Keys" + "\n");
webPBar.setString("Adding Keys...");
webPBar.setBgBottom(Color.MAGENTA);
//webPBar.setBgBottom(Color.MAGENTA);
BatchSentence bsentence = new BatchSentenceResource(session_target, targetFKadd);
java.util.List l = bsentence.list();
@@ -2059,7 +2059,7 @@ public final class Transfer extends JPanel implements JPanelView {
txtOut.append("Data Transfer Complete" + "\n");
webPBar.setString("Finished!");
webPBar.setBgBottom(Color.GREEN);
//webPBar.setBgBottom(Color.GREEN);
jbtnTransfer.setEnabled(true);
JOptionPane.showMessageDialog(this
@@ -2204,7 +2204,7 @@ public final class Transfer extends JPanel implements JPanelView {
jlblDBSize = new javax.swing.JLabel();
jtxtDbName = new com.alee.laf.text.WebTextField();
jbtnTransfer = new javax.swing.JButton();
webMemoryBar = new com.alee.extended.statusbar.WebMemoryBar();
//webMemoryBar = new com.alee.extended.statusbar.WebMemoryBar();
jLabel10 = new javax.swing.JLabel();
jLabel15 = new javax.swing.JLabel();
jbtnSet = new javax.swing.JButton();
@@ -2352,9 +2352,9 @@ public final class Transfer extends JPanel implements JPanelView {
});
webPBar.setFont(new java.awt.Font("Arial", 0, 13)); // NOI18N
webPBar.setHighlightDarkWhite(new java.awt.Color(204, 0, 0));
//webPBar.setHighlightDarkWhite(new java.awt.Color(204, 0, 0));
webPBar.setPreferredSize(new java.awt.Dimension(240, 30));
webPBar.setProgressBottomColor(new java.awt.Color(0, 153, 255));
//webPBar.setProgressBottomColor(new java.awt.Color(0, 153, 255));
jtxtDbServerPort.setForeground(new java.awt.Color(51, 51, 51));
jtxtDbServerPort.setToolTipText(bundle.getString("tootltip.servernameport")); // NOI18N
@@ -2450,13 +2450,13 @@ public final class Transfer extends JPanel implements JPanelView {
}
});
webMemoryBar.setBackground(new java.awt.Color(153, 153, 153));
webMemoryBar.setText("Text");
webMemoryBar.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
webMemoryBar.setPreferredSize(new java.awt.Dimension(150, 30));
webMemoryBar.setUsedBorderColor(new java.awt.Color(0, 204, 204));
webMemoryBar.setUsedFillColor(new java.awt.Color(0, 204, 255));
//webMemoryBar.setBackground(new java.awt.Color(153, 153, 153));
//webMemoryBar.setText("Text");
//webMemoryBar.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
//webMemoryBar.setPreferredSize(new java.awt.Dimension(150, 30));
//webMemoryBar.setUsedBorderColor(new java.awt.Color(0, 204, 204));
//webMemoryBar.setUsedFillColor(new java.awt.Color(0, 204, 255));
//
jLabel10.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
jLabel10.setForeground(new java.awt.Color(102, 102, 102));
jLabel10.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
@@ -2531,7 +2531,7 @@ public final class Transfer extends JPanel implements JPanelView {
.addComponent(jLabel15, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(null, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 1, Short.MAX_VALUE)))
.addGroup(jTransferPanelLayout.createSequentialGroup()
.addComponent(jLabel14, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -2550,7 +2550,7 @@ public final class Transfer extends JPanel implements JPanelView {
.addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel13, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(jCBSchema, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(webMemoryBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(null, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jTransferPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jtxtDbParams, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -3011,7 +3011,7 @@ public final class Transfer extends JPanel implements JPanelView {
private com.alee.laf.text.WebPasswordField txtDbPass;
private com.alee.laf.text.WebTextField txtDbUser;
private javax.swing.JTextArea txtOut;
private com.alee.extended.statusbar.WebMemoryBar webMemoryBar;
//private com.alee.extended.statusbar.WebMemoryBar webMemoryBar;
private com.alee.laf.progressbar.WebProgressBar webPBar;
// End of variables declaration//GEN-END:variables