From 71b57f8dfb70a7f5319ade7e153cdd6a022ee296 Mon Sep 17 00:00:00 2001
From: xtof <christophe.mcr@gmail.com>
Date: Thu, 1 Oct 2020 21:52:35 +0200
Subject: [PATCH] update

---
 .../cmd/OptionsAnalysis.java                  |  2 +-
 .../AmsatListFile.java                        | 29 +++++++++++++++++--
 pom.xml                                       |  3 +-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java b/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java
index 19fe6393..d1a88b7c 100644
--- a/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java
+++ b/ApplicationSatelliteDatabaseCli/src/main/java/org/josast/ApplicationSatelliteDatabaseCli/cmd/OptionsAnalysis.java
@@ -18,7 +18,7 @@ public class OptionsAnalysis {
     /**
      * List of command to execute.
      */
-    private Vector<Cmd> listeCmd = new Vector<Cmd>();
+   private Vector<Cmd> listeCmd = new Vector<Cmd>();
     /**
      * Option.
      */
diff --git a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java
index 6866ae7c..ad688ce1 100644
--- a/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java
+++ b/ModuleSatelliteDatabase/src/main/java/org/josast/ModuleSatelliteDatabase/AmsatListFile.java
@@ -3,6 +3,7 @@ package org.josast.ModuleSatelliteDatabase;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.ListIterator;
 import javax.xml.bind.JAXBContext;
@@ -16,8 +17,12 @@ import org.josast.AmsatList.generated.Satellites;
 
 public class AmsatListFile {
 	
-	FlatSatList amsatListFlat = new FlatSatList();
-    AmsatList amsatList = null;
+	private FlatSatList amsatListFlat = new FlatSatList();
+    private AmsatList amsatList = null;
+    private Hashtable<String, Satellites> amsatListByName = new Hashtable<String, Satellites>();
+    private Hashtable<Integer, Satellites> amsatListNasaId = new Hashtable<Integer, Satellites>();
+    
+    
 
     /**
      * @param filein
@@ -71,6 +76,8 @@ public class AmsatListFile {
         while (it.hasNext()) {
             Satellites sat = it.next();
             AmsatListFlat amSatFlat = new AmsatListFlat(sat);
+            amsatListByName.put(sat.getName(), sat);
+            amsatListNasaId.put(sat.getNasaID(), sat);
             amsatListFlat.put(amSatFlat.getSatelliteNoradId(),amSatFlat);
         }
 
@@ -134,7 +141,23 @@ public class AmsatListFile {
 	public void setAmsatList(AmsatList amsatList) {
 		this.amsatList = amsatList;
 	}
-    
+
+
+
+
+
+	/**
+	 * @return the amsatListNasaId
+	 */
+	public Hashtable<Integer, Satellites> getAmsatListNasaId() {
+		return amsatListNasaId;
+	}
+
+	public Hashtable<String, Satellites> getAmsatListByName() {
+		return amsatListByName;
+	}
+
+
     
 
 }
diff --git a/pom.xml b/pom.xml
index 7be68d20..a38010c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -695,7 +694,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>E:/gitjosast/josast/lib</outputDirectory>
+							<outputDirectory>D:\01-Projets\josast\lib</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
-- 
GitLab