+ Made ELEMENT a singleton.

% PMD updated Material, MaterialStack and ELEMENT.

1 files changed, 72 insertions, 63 deletions

diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 1265905c24..73d49e2694 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -5,58 +5,67 @@ import gtPlusPlus.core.util.materials.MaterialUtils;
 
 public final class ELEMENT {
 	
+	private static final ELEMENT thisClass = new ELEMENT();
+	
+	public ELEMENT(){
+		
+	}	
+	
+	public static ELEMENT getInstance(){
+	return thisClass;	
+	}
 
 	//First 50 Elements
-	public static final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
-	public static final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
-	public static final Material LITHIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium);
-	public static final Material BERYLLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Beryllium);
-	public static final Material BORON = MaterialUtils.generateMaterialFromGtENUM(Materials.Boron);
-	public static final Material CARBON = MaterialUtils.generateMaterialFromGtENUM(Materials.Carbon);
-	public static final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen);
-	public static final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen);
-	public static final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine);
-	//public static final Material NEON = MaterialUtils.generateMaterialFromGtENUM(Materials.Ne);
-	public static final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium);
-	public static final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium);
-	public static final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium);
-	public static final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon);
-	public static final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus);
-	public static final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur);
-	public static final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine);
-	public static final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon);
-	public static final Material POTASSIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Potassium);
-	public static final Material CALCIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Calcium);
-	public static final Material SCANDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Scandium);
-	public static final Material TITANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Titanium);
-	public static final Material VANADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium);
-	public static final Material CHROMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Chrome);
-	public static final Material MANGANESE = MaterialUtils.generateMaterialFromGtENUM(Materials.Manganese);
-	public static final Material IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.Iron);
-	public static final Material COBALT = MaterialUtils.generateMaterialFromGtENUM(Materials.Cobalt);
-	public static final Material NICKEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel);
-	public static final Material COPPER = MaterialUtils.generateMaterialFromGtENUM(Materials.Copper);
-	public static final Material ZINC = MaterialUtils.generateMaterialFromGtENUM(Materials.Zinc);
-	public static final Material GALLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gallium);
-	//public static final Material GERMANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Germanium);
-	public static final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic);
-	//public static final Material SELENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Selenium);
-	//public static final Material BROMINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bromine);
-	//public static final Material KRYPTON = MaterialUtils.generateMaterialFromGtENUM(Materials.Krypton);
-	public static final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
-	public static final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium);
-	public static final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
-	public static final Material ZIRCONIUM = new Material("Zirconium", new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
-	public static final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
-	public static final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum);
-	//public static final Material TECHNETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Technetium);
-	//public static final Material RUTHENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ruthenium);
-	//public static final Material RHODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rhodium);
-	public static final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium);
-	public static final Material SILVER = MaterialUtils.generateMaterialFromGtENUM(Materials.Silver);
-	public static final Material CADMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cadmium);
-	public static final Material INDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Indium);
-	public static final Material TIN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tin);
+	public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
+	public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
+	public final Material LITHIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium);
+	public final Material BERYLLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Beryllium);
+	public final Material BORON = MaterialUtils.generateMaterialFromGtENUM(Materials.Boron);
+	public final Material CARBON = MaterialUtils.generateMaterialFromGtENUM(Materials.Carbon);
+	public final Material NITROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Nitrogen);
+	public final Material OXYGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Oxygen);
+	public final Material FLUORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Fluorine);
+	//public final Material NEON = MaterialUtils.generateMaterialFromGtENUM(Materials.Ne);
+	public final Material SODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Sodium);
+	public final Material MAGNESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Magnesium);
+	public final Material ALUMINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Aluminium);
+	public final Material SILICON = MaterialUtils.generateMaterialFromGtENUM(Materials.Silicon);
+	public final Material PHOSPHORUS = MaterialUtils.generateMaterialFromGtENUM(Materials.Phosphorus);
+	public final Material SULFUR = MaterialUtils.generateMaterialFromGtENUM(Materials.Sulfur);
+	public final Material CHLORINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Chlorine);
+	public final Material ARGON = MaterialUtils.generateMaterialFromGtENUM(Materials.Argon);
+	public final Material POTASSIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Potassium);
+	public final Material CALCIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Calcium);
+	public final Material SCANDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Scandium);
+	public final Material TITANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Titanium);
+	public final Material VANADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium);
+	public final Material CHROMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Chrome);
+	public final Material MANGANESE = MaterialUtils.generateMaterialFromGtENUM(Materials.Manganese);
+	public final Material IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.Iron);
+	public final Material COBALT = MaterialUtils.generateMaterialFromGtENUM(Materials.Cobalt);
+	public final Material NICKEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Nickel);
+	public final Material COPPER = MaterialUtils.generateMaterialFromGtENUM(Materials.Copper);
+	public final Material ZINC = MaterialUtils.generateMaterialFromGtENUM(Materials.Zinc);
+	public final Material GALLIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Gallium);
+	//public final Material GERMANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Germanium);
+	public final Material ARSENIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Arsenic);
+	//public final Material SELENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Selenium);
+	//public final Material BROMINE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bromine);
+	//public final Material KRYPTON = MaterialUtils.generateMaterialFromGtENUM(Materials.Krypton);
+	public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
+	public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Strontium);
+	public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
+	public final Material ZIRCONIUM = new Material("Zirconium", new short[]{255, 250, 205}, 1855, 4377, 40, 51, false, "Zr", 0);//Not a GT Inherited Material
+	public final Material NIOBIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Niobium);
+	public final Material MOLYBDENUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Molybdenum);
+	//public final Material TECHNETIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Technetium);
+	//public final Material RUTHENIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Ruthenium);
+	//public final Material RHODIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rhodium);
+	public final Material PALLADIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Palladium);
+	public final Material SILVER = MaterialUtils.generateMaterialFromGtENUM(Materials.Silver);
+	public final Material CADMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cadmium);
+	public final Material INDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Indium);
+	public final Material TIN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tin);
 
 
 
@@ -67,19 +76,19 @@ public final class ELEMENT {
 
 
 	//Second 50 elements
-	public static final Material TANTALUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Tantalum);
-	public static final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
-	public static final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium);
-	public static final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);	
-	public static final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);	
-	public static final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);	
-	public static final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);	
-	public static final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);	
-	public static final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon);	
-	public static final Material THORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thorium);	
-	public static final Material URANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);	
-	public static final Material PLUTONIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium);	
-	public static final Material URANIUM233 = new Material("Uranium-233", new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material
+	public final Material TANTALUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Tantalum);
+	public final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
+	public final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium);
+	public final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);	
+	public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);	
+	public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);	
+	public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);	
+	public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);	
+	public final Material RADON = MaterialUtils.generateMaterialFromGtENUM(Materials.Radon);	
+	public final Material THORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thorium);	
+	public final Material URANIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);	
+	public final Material PLUTONIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Plutonium);	
+	public final Material URANIUM233 = new Material("Uranium-233", new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material
 
 
 }