maiora/Cassa-DSU
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rollback rename

Browse Source 
risoluzione problema file duplicati: Git su windows non è case sensitive, pertanto si è reso necessario effettuare un rename (con il suffisso 'new) dei files per permettere a Git di riconoscere il cambio di nome del file stesso
This commit is contained in:
Francesco Di Sciascio 2024-11-05 14:23:49 +01:00
parent ab1de5bf41
commit 564dbeaf7a
11 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/puntocassa/FrmMeteoNew.form → src/puntocassa/FrmMeteo.form
View File

18
src/puntocassa/FrmMeteoNew.java → src/puntocassa/FrmMeteo.java
View File

@ -29,7 +29,7 @@ import puntocassa.utils.Utils;
* *
* @author Marco * @author Marco
*/ */
public class FrmMeteoNew extends javax.swing.JFrame { public class FrmMeteo extends javax.swing.JFrame {
private PuntoCassa frmPuntoCassa; private PuntoCassa frmPuntoCassa;
private Long idPuntoCassa=0L; private Long idPuntoCassa=0L;
@ -42,7 +42,7 @@ public class FrmMeteoNew extends javax.swing.JFrame {
/** /**
* Creates new form frm * Creates new form frm
*/ */
public FrmMeteoNew(PuntoCassa frm, Long id_Punto_Cassa,Boolean Nuovo) { public FrmMeteo(PuntoCassa frm, Long id_Punto_Cassa,Boolean Nuovo) {
frmPuntoCassa=frm; frmPuntoCassa=frm;
frmPuntoCassa.setEnabled(false); frmPuntoCassa.setEnabled(false);
@ -352,23 +352,27 @@ public class FrmMeteoNew extends javax.swing.JFrame {
} }
} }
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException ex) {
java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (InstantiationException ex) { } catch (InstantiationException ex) {
java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (javax.swing.UnsupportedLookAndFeelException ex) { } catch (javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(FrmMeteoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMeteo.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} }
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
/* Create and display the form */ /* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
new FrmMeteoNew(null,0L,true).setVisible(true); new FrmMeteo(null,0L,true).setVisible(true);
} }
}); });
} }

0
src/puntocassa/FrmMovimentiNew.form → src/puntocassa/FrmMovimenti.form
View File

22
src/puntocassa/FrmMovimentiNew.java → src/puntocassa/FrmMovimenti.java
View File

@ -27,7 +27,7 @@ import puntocassa.utils.Utils;
* *
* @author Marco * @author Marco
*/ */
public class FrmMovimentiNew extends javax.swing.JFrame { public class FrmMovimenti extends javax.swing.JFrame {
private PuntoCassa frmPuntoCassa; private PuntoCassa frmPuntoCassa;
private Long idTessera=0L,idPuntoCassa=0L; private Long idTessera=0L,idPuntoCassa=0L;
@ -40,7 +40,7 @@ public class FrmMovimentiNew extends javax.swing.JFrame {
/** /**
* Creates new form frm * Creates new form frm
*/ */
public FrmMovimentiNew(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath) { public FrmMovimenti(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath) {
frmPuntoCassa=frm; frmPuntoCassa=frm;
frmPuntoCassa.setEnabled(false); frmPuntoCassa.setEnabled(false);
@ -483,13 +483,13 @@ public class FrmMovimentiNew extends javax.swing.JFrame {
} }
} }
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException ex) {
java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (InstantiationException ex) { } catch (InstantiationException ex) {
java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (javax.swing.UnsupportedLookAndFeelException ex) { } catch (javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(FrmMovimentiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmMovimenti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} }
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
@ -499,11 +499,19 @@ public class FrmMovimentiNew extends javax.swing.JFrame {
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
/* Create and display the form */ /* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
new FrmMovimentiNew(null,0L,0L,null).setVisible(true); new FrmMovimenti(null,0L,0L,null).setVisible(true);
} }
}); });
} }

0
src/puntocassa/FrmProdottiNew.form → src/puntocassa/FrmProdotti.form
View File

18
src/puntocassa/FrmProdottiNew.java → src/puntocassa/FrmProdotti.java
View File

@ -30,7 +30,7 @@ import puntocassa.utils.Utils;
* *
* @author Marco * @author Marco
*/ */
public class FrmProdottiNew extends javax.swing.JFrame { public class FrmProdotti extends javax.swing.JFrame {
private PuntoCassa frmPuntoCassa; private PuntoCassa frmPuntoCassa;
@ -43,7 +43,7 @@ private PuntoCassa frmPuntoCassa;
/** /**
* Creates new form frm * Creates new form frm
*/ */
public FrmProdottiNew(PuntoCassa frm,String imgPath) { public FrmProdotti(PuntoCassa frm,String imgPath) {
frmPuntoCassa=frm; frmPuntoCassa=frm;
frmPuntoCassa.setEnabled(false); frmPuntoCassa.setEnabled(false);
@ -678,23 +678,27 @@ private PuntoCassa frmPuntoCassa;
} }
} }
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException ex) {
java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (InstantiationException ex) { } catch (InstantiationException ex) {
java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (javax.swing.UnsupportedLookAndFeelException ex) { } catch (javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(FrmProdottiNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProdotti.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} }
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
/* Create and display the form */ /* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
new FrmProdottiNew(null,null).setVisible(true); new FrmProdotti(null,null).setVisible(true);
} }
}); });
} }

0
src/puntocassa/FrmProgressNew.form → src/puntocassa/FrmProgress.form
View File

18
src/puntocassa/FrmProgressNew.java → src/puntocassa/FrmProgress.java
View File

@ -13,14 +13,14 @@ import javax.swing.ImageIcon;
* *
* @author Marco * @author Marco
*/ */
public class FrmProgressNew extends javax.swing.JFrame { public class FrmProgress extends javax.swing.JFrame {
private PuntoCassa frmPuntoCassa; private PuntoCassa frmPuntoCassa;
/** /**
* Creates new form frm * Creates new form frm
*/ */
public FrmProgressNew(PuntoCassa frm) { public FrmProgress(PuntoCassa frm) {
frmPuntoCassa=frm; frmPuntoCassa=frm;
initComponents(); initComponents();
String startDir = System.getProperty("user.dir"); String startDir = System.getProperty("user.dir");
@ -117,23 +117,27 @@ public class FrmProgressNew extends javax.swing.JFrame {
} }
} }
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException ex) {
java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (InstantiationException ex) { } catch (InstantiationException ex) {
java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (javax.swing.UnsupportedLookAndFeelException ex) { } catch (javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(FrmProgressNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmProgress.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} }
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
/* Create and display the form */ /* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
new FrmProgressNew(null).setVisible(true); new FrmProgress(null).setVisible(true);
} }
}); });
} }

0
src/puntocassa/FrmStornoNew.form → src/puntocassa/FrmStorno.form
View File

18
src/puntocassa/FrmStornoNew.java → src/puntocassa/FrmStorno.java
View File

@ -27,7 +27,7 @@ import puntocassa.utils.Utils;
* *
* @author Marco * @author Marco
*/ */
public class FrmStornoNew extends javax.swing.JFrame { public class FrmStorno extends javax.swing.JFrame {
private PuntoCassa frmPuntoCassa; private PuntoCassa frmPuntoCassa;
private Long idTessera=0L,idPuntoCassa=0L; private Long idTessera=0L,idPuntoCassa=0L;
@ -41,7 +41,7 @@ public class FrmStornoNew extends javax.swing.JFrame {
/** /**
* Creates new form frm * Creates new form frm
*/ */
public FrmStornoNew(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath,Boolean azzera) { public FrmStorno(PuntoCassa frm,Long IDTessera,Long IDPuntoCassa,String imgPath,Boolean azzera) {
frmPuntoCassa=frm; frmPuntoCassa=frm;
frmPuntoCassa.setEnabled(false); frmPuntoCassa.setEnabled(false);
@ -554,23 +554,27 @@ public class FrmStornoNew extends javax.swing.JFrame {
} }
} }
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException ex) {
java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (InstantiationException ex) { } catch (InstantiationException ex) {
java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} catch (javax.swing.UnsupportedLookAndFeelException ex) { } catch (javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(FrmStornoNew.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); java.util.logging.Logger.getLogger(FrmStorno.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
} }
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold> //</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
//</editor-fold>
/* Create and display the form */ /* Create and display the form */
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
new FrmStornoNew(null,0L,0L,null,false).setVisible(true); new FrmStorno(null,0L,0L,null,false).setVisible(true);
} }
}); });
} }

14
src/puntocassa/PuntoCassa.java
View File

@ -123,8 +123,8 @@ public class PuntoCassa extends JFrame implements ActionListener {
public int hFont = 15; public int hFont = 15;
private int altControlli = 100; private int altControlli = 100;
private int largControlli = 100; private int largControlli = 100;
public FrmProgressNew myProgressForm; public FrmProgress myProgressForm;
public FrmMeteoNew myMeteoForm; public FrmMeteo myMeteoForm;
private int gratuitaResidue = 0; private int gratuitaResidue = 0;
private int bonusResidui = 0; private int bonusResidui = 0;
private StringBuilder modiPagamento = new StringBuilder(""); private StringBuilder modiPagamento = new StringBuilder("");
@ -2694,7 +2694,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
this); this);
if (Integer.parseInt(spia) == 1) { if (Integer.parseInt(spia) == 1) {
if (myMeteoForm == null) { if (myMeteoForm == null) {
myMeteoForm = new FrmMeteoNew(this, idPuntoCassa, true); myMeteoForm = new FrmMeteo(this, idPuntoCassa, true);
this.setEnabled(false); this.setEnabled(false);
Integer w = calcolaLarghezzaAltezza(300, largControlli); Integer w = calcolaLarghezzaAltezza(300, largControlli);
@ -2938,7 +2938,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}//GEN-LAST:event_jBtnStornoActionPerformed }//GEN-LAST:event_jBtnStornoActionPerformed
private void apriStorno(Boolean daPassaggi) { private void apriStorno(Boolean daPassaggi) {
FrmStornoNew jFrameStorno = new FrmStornoNew(this, idTessera, idPuntoCassa, imgPath, daPassaggi); FrmStorno jFrameStorno = new FrmStorno(this, idTessera, idPuntoCassa, imgPath, daPassaggi);
this.setEnabled(false); this.setEnabled(false);
Integer w = calcolaLarghezzaAltezza(550, largControlli); Integer w = calcolaLarghezzaAltezza(550, largControlli);
Integer h = calcolaLarghezzaAltezza(250, altControlli); Integer h = calcolaLarghezzaAltezza(250, altControlli);
@ -2948,7 +2948,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
jFrameStorno.setVisible(true); jFrameStorno.setVisible(true);
} }
private void jBtnprodottiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnprodottiActionPerformed private void jBtnprodottiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnprodottiActionPerformed
FrmProdottiNew jFrameProdotti = new FrmProdottiNew(this, imgPath); FrmProdotti jFrameProdotti = new FrmProdotti(this, imgPath);
this.setEnabled(false); this.setEnabled(false);
Integer w = calcolaLarghezzaAltezza(550, largControlli); Integer w = calcolaLarghezzaAltezza(550, largControlli);
@ -3014,7 +3014,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
} }
if (aggiorna) { if (aggiorna) {
myProgressForm = new FrmProgressNew(this); myProgressForm = new FrmProgress(this);
this.setEnabled(false); this.setEnabled(false);
Integer w = calcolaLarghezzaAltezza(300, largControlli); Integer w = calcolaLarghezzaAltezza(300, largControlli);
@ -3156,7 +3156,7 @@ public class PuntoCassa extends JFrame implements ActionListener {
}//GEN-LAST:event_txtTotalePuntiActionPerformed }//GEN-LAST:event_txtTotalePuntiActionPerformed
private void jBtnMovimentiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnMovimentiActionPerformed private void jBtnMovimentiActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnMovimentiActionPerformed
FrmMovimentiNew jFrameMovimenti = new FrmMovimentiNew(this, idTessera, idPuntoCassa, imgPath); FrmMovimenti jFrameMovimenti = new FrmMovimenti(this, idTessera, idPuntoCassa, imgPath);
this.setEnabled(false); this.setEnabled(false);
Integer w = calcolaLarghezzaAltezza(680, largControlli); Integer w = calcolaLarghezzaAltezza(680, largControlli);