'#Removes nominatim panel installation as it will be improved and

finished in a new Branch (with the new FilterManager interface).
sepinf-inc · Sep 21, 2023 · 6dcec30 · 6dcec30
1 parent 14c024a
commit 6dcec30
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/iped-app/src/main/java/iped/app/ui/App.java b/iped-app/src/main/java/iped/app/ui/App.java
@@ -135,6 +135,7 @@
 import iped.engine.search.MultiSearchResult;
 import iped.engine.task.ImageThumbTask;
 import iped.engine.util.Util;
+import iped.geo.nominatim.ui.NominatimPanel;
 import iped.parsers.standard.StandardParser;
 import iped.search.IIPEDSearcher;
 import iped.search.IMultiSearchResult;
@@ -271,6 +272,10 @@ public class App extends JFrame implements WindowListener, IMultiSearchResultPro
 
     private Set<String> highlightTerms = new HashSet<>();
 
+    private NominatimPanel nominatimPanel;
+
+    private DefaultSingleCDockable nominatimTabDock;
+
     private App() {
     }
 
@@ -626,6 +631,7 @@ public void componentResized(ComponentEvent e) {
 
         metadataPanel = new MetadataPanel();
         categoriesPanel = new JScrollPane(categoryTree);
+        nominatimPanel = new NominatimPanel(this);
         bookmarksPanel = new JScrollPane(bookmarksTree);
 
         recursiveTreeList = new JCheckBox(Messages.getString("App.RecursiveListing")); //$NON-NLS-1$
@@ -858,6 +864,9 @@ public void updateUI(boolean refresh) {
     private void createAllDockables() {
         categoriesTabDock = createDockable("categoriestab", Messages.getString("CategoryTreeModel.RootName"), //$NON-NLS-1$ //$NON-NLS-2$
                 categoriesPanel);
+        nominatimTabDock = createDockable("nominatimtab", "nominatimPanel", //$NON-NLS-1$ //$NON-NLS-2$
+                nominatimPanel);
+
         metadataTabDock = createDockable("metadatatab", Messages.getString("App.Metadata"), metadataPanel); //$NON-NLS-1$ //$NON-NLS-2$
         if (evidencePanel != null) {
             evidenceTabDock = createDockable("evidencetab", Messages.getString("TreeViewModel.RootName"), //$NON-NLS-1$ //$NON-NLS-2$
@@ -970,6 +979,7 @@ public void changed(CDockableLocationEvent event) {
                 referencedByScroll);
 
         dockingControl.addDockable(categoriesTabDock);
+        dockingControl.addDockable(nominatimTabDock);
         dockingControl.addDockable(metadataTabDock);
         if (evidenceTabDock != null) {
             dockingControl.addDockable(evidenceTabDock);
@@ -1134,7 +1144,7 @@ private void removeAllDockables() {
         List<DefaultSingleCDockable> docks = new ArrayList<>();
         docks.addAll(Arrays.asList(hitsDock, subitemDock, duplicateDock, parentDock, tableTabDock, galleryTabDock,
                 bookmarksTabDock, evidenceTabDock, metadataTabDock, categoriesTabDock, graphDock, referencesDock,
-                referencedByDock));
+                referencedByDock, nominatimTabDock));
         docks.addAll(viewerDocks);
         docks.addAll(rsTabDock);
         rsTabDock.clear();
@@ -1318,6 +1328,9 @@ public void adjustLayout(boolean isReset) {
         categoriesTabDock.setLocation(CLocation.base().normalWest(0.20).north(0.5));
         categoriesTabDock.setVisible(true);
 
+        nominatimTabDock.setLocationsAside(categoriesTabDock);
+        nominatimTabDock.setVisible(true);
+
         if (evidenceTabDock != null) {
             evidenceTabDock.setLocationsAside(categoriesTabDock);
             evidenceTabDock.setVisible(true);
@@ -1334,6 +1347,7 @@ public void adjustLayout(boolean isReset) {
 
         selectDockableTab(viewerDocks.get(viewerDocks.size() - 1));
         selectDockableTab(categoriesTabDock);
+        selectDockableTab(nominatimTabDock);
         selectDockableTab(bookmarksTabDock);
         selectDockableTab(tableTabDock);
 

diff --git a/iped-app/src/main/java/iped/app/ui/UICaseDataLoader.java b/iped-app/src/main/java/iped/app/ui/UICaseDataLoader.java
@@ -36,7 +36,6 @@
 import iped.engine.data.IPEDSource;
 import iped.engine.task.ParsingTask;
 import iped.engine.task.SignatureTask;
-import iped.geo.nominatim.ui.NominatimPanel;
 import iped.parsers.standard.StandardParser;
 
 public class UICaseDataLoader extends SwingWorker<Void, Integer> {
@@ -175,7 +174,6 @@ public void run() {
     public void done() {
         try {
             CategoryTreeModel.install();
-            NominatimPanel.install(App.get());
             App.get().filterManager.loadFilters();
             BookmarksController.get().updateUIandHistory();