Extract PES constants

src/main/java/pes/editor/Ability99Panel.java

@@ -108,7 +108,7 @@ public boolean verify(JComponent input) {
 				int v = Integer.parseInt(tf.getText());
 				return v > 0 && v < 100;
 			} catch (NumberFormatException exception) {
-				EditorLogger.Log(exception);
+				EditorLogger.log(exception);
 				return false;
 			}
 		}

src/main/java/pes/editor/BackChooserDialog.java

@@ -43,7 +43,7 @@ public BackChooserDialog(Frame owner) {
 					bi = ImageIO.read(backURL);
 					raster[l] = bi.getData();
 				} catch (IOException exception) {
-					EditorLogger.Log(exception);
+					EditorLogger.log(exception);
 				}
 			}
 			flagButton[l].setMargin(new Insets(0, 0, 0, 0));

src/main/java/pes/editor/CSVFilter.java

@@ -1,5 +1,7 @@
 package pes.editor;
 
+import pes.editor.constants.PESConstant;
+
 import java.io.File;
 
 import javax.swing.filechooser.FileFilter;
@@ -13,7 +15,7 @@ public boolean accept(File f) {
 		}
 
 		var extension = PESUtils.getExtension(f);
-        return extension != null && extension.equals(PESUtils.csv);
+        return extension != null && extension.equals(PESConstant.CSV_FILE_EXTENSION);
 
     }
 

src/main/java/pes/editor/Editor.java

@@ -1,6 +1,7 @@
 package pes.editor;
 
-import pes.editor.constants.OptionFileConstants;
+import pes.editor.constants.OptionFileConstant;
+import pes.editor.constants.PESConstant;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -263,7 +264,7 @@ public void actionPerformed(ActionEvent a) {
 						if (of.format == 0) {
 							if ((PESUtils.getExtension(dest) == null)
 									|| !(PESUtils.getExtension(dest)
-											.equals(PESUtils.xps))) {
+											.equals(PESConstant.XPS_FILE_EXTENSION))) {
 								dest = new File(dest.getParent()
 										+ File.separator + dest.getName()
 										+ ".xps");
@@ -272,7 +273,7 @@ public void actionPerformed(ActionEvent a) {
 						if (of.format == 2) {
 							if ((PESUtils.getExtension(dest) == null)
 									|| !(PESUtils.getExtension(dest)
-											.equals(PESUtils.psu))) {
+											.equals(PESConstant.PSU_FILE_EXTENSION))) {
 								dest = new File(dest.getParent()
 										+ File.separator + dest.getName()
 										+ ".psu");
@@ -281,7 +282,7 @@ public void actionPerformed(ActionEvent a) {
 						if (of.format == 3) {
 							if ((PESUtils.getExtension(dest) == null)
 									|| !(PESUtils.getExtension(dest)
-											.equals(PESUtils.max))) {
+											.equals(PESConstant.MAX_FILE_EXTENSION))) {
 								dest = new File(dest.getParent()
 										+ File.separator + dest.getName()
 										+ ".max");
@@ -372,7 +373,7 @@ public void actionPerformed(ActionEvent c) {
 						final boolean create = csvSwitch.create.isSelected();
 						if ((PESUtils.getExtension(dest) == null)
 								|| !(PESUtils.getExtension(dest)
-										.equals(PESUtils.csv))) {
+										.equals(PESConstant.CSV_FILE_EXTENSION))) {
 							dest = new File(dest.getParent() + File.separator
 									+ dest.getName() + ".csv");
 						}
@@ -439,7 +440,7 @@ public void actionPerformed(ActionEvent c) {
 						final boolean updateClassicTeams = csvImportSwitch.updateClassicTeams.isSelected();
 						if ((PESUtils.getExtension(src) == null)
 								|| !(PESUtils.getExtension(src)
-										.equals(PESUtils.csv))) {
+										.equals(PESConstant.CSV_FILE_EXTENSION))) {
 							src = new File(src.getParent() + File.separator
 									+ src.getName() + ".csv");
 						}
@@ -470,20 +471,20 @@ public void doIt() {
 
 		convertItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent a) {
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[2], of.data,
-						OptionFileConstants.BLOCKS[2], OptionFileConstants.BLOCK_SIZE[2]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[3], of.data,
-						OptionFileConstants.BLOCKS[3], OptionFileConstants.BLOCK_SIZE[3]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[4], of.data,
-						OptionFileConstants.BLOCKS[4], OptionFileConstants.BLOCK_SIZE[4]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[5], of.data,
-						OptionFileConstants.BLOCKS[5], OptionFileConstants.BLOCK_SIZE[5]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[6], of.data,
-						OptionFileConstants.BLOCKS[6], OptionFileConstants.BLOCK_SIZE[6]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[7], of.data,
-						OptionFileConstants.BLOCKS[7], OptionFileConstants.BLOCK_SIZE[7]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[8], of.data,
-						OptionFileConstants.BLOCKS[8], OptionFileConstants.BLOCK_SIZE[8]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[2], of.data,
+						OptionFileConstant.BLOCKS[2], OptionFileConstant.BLOCK_SIZE[2]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[3], of.data,
+						OptionFileConstant.BLOCKS[3], OptionFileConstant.BLOCK_SIZE[3]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[4], of.data,
+						OptionFileConstant.BLOCKS[4], OptionFileConstant.BLOCK_SIZE[4]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[5], of.data,
+						OptionFileConstant.BLOCKS[5], OptionFileConstant.BLOCK_SIZE[5]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[6], of.data,
+						OptionFileConstant.BLOCKS[6], OptionFileConstant.BLOCK_SIZE[6]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[7], of.data,
+						OptionFileConstant.BLOCKS[7], OptionFileConstant.BLOCK_SIZE[7]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[8], of.data,
+						OptionFileConstant.BLOCKS[8], OptionFileConstant.BLOCK_SIZE[8]);
 				System.arraycopy(of2.data, 657116, of.data, 657116, 828);
 
 				if (!of.isWE() && of2.isWE()) {
@@ -683,9 +684,9 @@ private File loadSet() {
 					dir = null;
 				}
 			} catch (IOException exception){
-				EditorLogger.Log(exception);
+				EditorLogger.log(exception);
 			} catch (ClassNotFoundException exception) {
-                EditorLogger.Log(exception);
+                EditorLogger.log(exception);
             }
         }
 		return dir;

src/main/java/pes/editor/EditorLogger.java

@@ -2,7 +2,7 @@
 
 public class EditorLogger {
 
-    public static void Log(Exception exception) {
+    public static void log(Exception exception) {
 
         // TODO: Implement logging.
         System.err.println(exception.toString());

src/main/java/pes/editor/EmblemPanel.java

@@ -1,5 +1,7 @@
 package pes.editor;
 
+import pes.editor.constants.PESConstant;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridLayout;
@@ -288,7 +290,7 @@ private void savePNG(boolean is128, int slot) {
 		if (returnVal == JFileChooser.APPROVE_OPTION) {
 			File dest = chooserPNG.getSelectedFile();
 			if ((PESUtils.getExtension(dest) == null)
-					|| !(PESUtils.getExtension(dest).equals(PESUtils.png))) {
+					|| !(PESUtils.getExtension(dest).equals(PESConstant.PNG_FILE_EXTENSION))) {
 				dest = new File(dest.getParent() + File.separator
 						+ dest.getName() + ".png");
 			}

src/main/java/pes/editor/FormPanel.java

@@ -1,5 +1,7 @@
 package pes.editor;
 
+import pes.editor.constants.PESConstant;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -830,7 +832,7 @@ private void savePNG() {
 		if (returnVal == JFileChooser.APPROVE_OPTION) {
 			File dest = chooserPNG.getSelectedFile();
 			if ((PESUtils.getExtension(dest) == null)
-					|| !(PESUtils.getExtension(dest).equals(PESUtils.png))) {
+					|| !(PESUtils.getExtension(dest).equals(PESConstant.PNG_FILE_EXTENSION))) {
 				// System.out.println(dest);
 				dest = new File(dest.getParent() + File.separator
 						+ dest.getName() + ".png");

src/main/java/pes/editor/GIFPNGFilter.java

@@ -1,5 +1,7 @@
 package pes.editor;
 
+import pes.editor.constants.PESConstant;
+
 import java.io.File;
 
 import javax.swing.filechooser.FileFilter;
@@ -14,8 +16,8 @@ public boolean accept(File f) {
 
 		String extension = PESUtils.getExtension(f);
 		if (extension != null) {
-			if ((extension.equals(PESUtils.png) || extension
-					.equals(PESUtils.gif))) {
+			if ((extension.equals(PESConstant.PNG_FILE_EXTENSION) || extension
+					.equals(PESConstant.GIF_FILE_EXTENSION))) {
 				return true;
 			} else {
 				return false;

src/main/java/pes/editor/ImportPanel.java

@@ -1,6 +1,6 @@
 package pes.editor;
 
-import pes.editor.constants.OptionFileConstants;
+import pes.editor.constants.OptionFileConstant;
 
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
@@ -70,12 +70,12 @@ public ImportPanel(OptionFile opf, OptionFile opf2, WENShopPanel w,
 				"Options / PES points / Shop items / Cup gallery / Memorial match data");
 		optionsButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent a) {
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[0], of.data,
-						OptionFileConstants.BLOCKS[0], OptionFileConstants.BLOCK_SIZE[0]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[1], of.data,
-						OptionFileConstants.BLOCKS[1], OptionFileConstants.BLOCK_SIZE[1]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[9], of.data,
-						OptionFileConstants.BLOCKS[9], OptionFileConstants.BLOCK_SIZE[9]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[0], of.data,
+						OptionFileConstant.BLOCKS[0], OptionFileConstant.BLOCK_SIZE[0]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[1], of.data,
+						OptionFileConstant.BLOCKS[1], OptionFileConstant.BLOCK_SIZE[1]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[9], of.data,
+						OptionFileConstant.BLOCKS[9], OptionFileConstant.BLOCK_SIZE[9]);
 				wenShop.wenPanel.refresh();
 				wenShop.shopPanel.status.setText("");
 				optionsButton.setEnabled(false);
@@ -109,12 +109,12 @@ public void actionPerformed(ActionEvent a) {
 		playerButton = new JButton("Players / Squads / Formations");
 		playerButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent a) {
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[3], of.data,
-						OptionFileConstants.BLOCKS[3], OptionFileConstants.BLOCK_SIZE[3]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[4], of.data,
-						OptionFileConstants.BLOCKS[4], OptionFileConstants.BLOCK_SIZE[4]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[5], of.data,
-						OptionFileConstants.BLOCKS[5], OptionFileConstants.BLOCK_SIZE[5]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[3], of.data,
+						OptionFileConstant.BLOCKS[3], OptionFileConstant.BLOCK_SIZE[3]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[4], of.data,
+						OptionFileConstant.BLOCKS[4], OptionFileConstant.BLOCK_SIZE[4]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[5], of.data,
+						OptionFileConstant.BLOCKS[5], OptionFileConstant.BLOCK_SIZE[5]);
 
 				if (!of.isWE() && of2.isWE()) {
 					Convert.allPlayers(of, Convert.WE2007_PES6);
@@ -143,10 +143,10 @@ public void actionPerformed(ActionEvent a) {
 		allKitButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent a) {
 				Clubs.importData(of, of2);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[7], of.data,
-						OptionFileConstants.BLOCKS[7], OptionFileConstants.BLOCK_SIZE[7]);
-				System.arraycopy(of2.data, OptionFileConstants.BLOCKS[8], of.data,
-						OptionFileConstants.BLOCKS[8], OptionFileConstants.BLOCK_SIZE[8]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[7], of.data,
+						OptionFileConstant.BLOCKS[7], OptionFileConstant.BLOCK_SIZE[7]);
+				System.arraycopy(of2.data, OptionFileConstant.BLOCKS[8], of.data,
+						OptionFileConstant.BLOCKS[8], OptionFileConstant.BLOCK_SIZE[8]);
 
 				if (!of.isWE() && of2.isWE()) {
 					Convert.allKitModel(of);

src/main/java/pes/editor/InfoPanel.java

@@ -96,7 +96,7 @@ public void refresh(int index1, int index2) {
 				}
 
 			} catch (BadLocationException exception) {
-				EditorLogger.Log(exception);
+				EditorLogger.log(exception);
 			}
 			ta.setCaretPosition(0);
 		}

src/main/java/pes/editor/KitImportDialog.java

@@ -1,5 +1,7 @@
 package pes.editor;
 
+import pes.editor.constants.PESConstant;
+
 import java.awt.BorderLayout;
 import java.awt.Frame;
 import java.awt.event.MouseEvent;
@@ -69,14 +71,14 @@ public void refresh(int i) {
 			}
 		} else {
 			if (i - Clubs.total > 56) {
-				model.addElement(new KitItem(PESUtils.extraSquad[i - Clubs.total - 57], i));
+				model.addElement(new KitItem(PESConstant.EXTRA_SQUADS[i - Clubs.total - 57], i));
 			} else {
 				model.addElement(new KitItem(Stats.nation[i - Clubs.total], i));
 			}
 			for (int n = Clubs.total; n < Clubs.total + 64; n++) {
 				if (n != i && !Kits.isLic(of2, n)) {
 					if (n - Clubs.total > 56) {
-						model.addElement(new KitItem(PESUtils.extraSquad[n - Clubs.total - 57], n));
+						model.addElement(new KitItem(PESConstant.EXTRA_SQUADS[n - Clubs.total - 57], n));
 					} else {
 						model.addElement(new KitItem(Stats.nation[n - Clubs.total], n));
 					}

src/main/java/pes/editor/LogoPanel.java

@@ -1,5 +1,7 @@
 package pes.editor;
 
+import pes.editor.constants.PESConstant;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridLayout;
@@ -135,7 +137,7 @@ private void savePNG(int slot) {
 		if (returnVal == JFileChooser.APPROVE_OPTION) {
 			File dest = chooserPNG.getSelectedFile();
 			if ((PESUtils.getExtension(dest) == null)
-					|| !(PESUtils.getExtension(dest).equals(PESUtils.png))) {
+					|| !(PESUtils.getExtension(dest).equals(PESConstant.PNG_FILE_EXTENSION))) {
 				dest = new File(dest.getParent() + File.separator
 						+ dest.getName() + ".png");
 			}