Skip to content

Commit

Permalink
'#1487 removes nominatim GUI panel installation as it will be improved
Browse files Browse the repository at this point in the history
in another branch.
  • Loading branch information
patrickdalla committed Sep 21, 2023
1 parent 700952a commit 627927b
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions iped-app/src/main/java/iped/app/ui/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
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;
Expand Down Expand Up @@ -272,10 +271,6 @@ public class App extends JFrame implements WindowListener, IMultiSearchResultPro

private Set<String> highlightTerms = new HashSet<>();

private NominatimPanel nominatimPanel;

private DefaultSingleCDockable nominatimTabDock;

private App() {
}

Expand Down Expand Up @@ -631,7 +626,6 @@ 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$
Expand Down Expand Up @@ -864,9 +858,6 @@ 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$
Expand Down Expand Up @@ -979,7 +970,6 @@ public void changed(CDockableLocationEvent event) {
referencedByScroll);

dockingControl.addDockable(categoriesTabDock);
dockingControl.addDockable(nominatimTabDock);
dockingControl.addDockable(metadataTabDock);
if (evidenceTabDock != null) {
dockingControl.addDockable(evidenceTabDock);
Expand Down Expand Up @@ -1144,7 +1134,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, nominatimTabDock));
referencedByDock));
docks.addAll(viewerDocks);
docks.addAll(rsTabDock);
rsTabDock.clear();
Expand Down Expand Up @@ -1328,9 +1318,6 @@ 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);
Expand All @@ -1347,7 +1334,6 @@ public void adjustLayout(boolean isReset) {

selectDockableTab(viewerDocks.get(viewerDocks.size() - 1));
selectDockableTab(categoriesTabDock);
selectDockableTab(nominatimTabDock);
selectDockableTab(bookmarksTabDock);
selectDockableTab(tableTabDock);

Expand Down

0 comments on commit 627927b

Please sign in to comment.