Merge pull request #2606 from ControlSystemStudio/CSSTUDIO-1873

Bug fix and cosmetic changes in save&restore search
ControlSystemStudio · Mar 22, 2023 · cc28ab9 · cc28ab9
2 parents c8e04e2 + 0b359a0
commit cc28ab9
Show file tree

Hide file tree

Showing 16 changed files with 951 additions and 1,015 deletions.
diff --git a/...restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/ImageRepository.java b/...restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/ImageRepository.java
@@ -39,13 +39,13 @@ public class ImageRepository {
     public static final Image GOLDEN_SNAPSHOT =
             ImageCache.getImage(ImageRepository.class, "/icons/save-and-restore/snapshot-golden.png");
     public static final Image COMPOSITE_SNAPSHOT =
-            ImageCache.getImage(SearchWindowController.class, "/icons/save-and-restore/composite-snapshot.png");
+            ImageCache.getImage(ImageRepository.class, "/icons/save-and-restore/composite-snapshot.png");
     public static final Image EDIT_CONFIGURATION =
-            ImageCache.getImage(SearchWindowController.class, "/icons/save-and-restore/edit-configuration.png");
+            ImageCache.getImage(ImageRepository.class, "/icons/save-and-restore/edit-configuration.png");
 
     public static final Image SNAPSHOT_ADD_TAG_WITH_COMMENT =
-        ImageCache.getImage(SaveAndRestoreController.class, "/icons/save-and-restore/snapshot-add_tag.png");
+        ImageCache.getImage(ImageRepository.class, "/icons/save-and-restore/snapshot-add_tag.png");
 
     public static final Image SNAPSHOT_REMOVE_TAG_WITH_COMMENT =
-            ImageCache.getImage(SaveAndRestoreController.class, "/icons/save-and-restore/snapshot-remove_tag.png");
+            ImageCache.getImage(ImageRepository.class, "/icons/save-and-restore/snapshot-remove_tag.png");
 }
diff --git a/...in/java/org/phoebus/applications/saveandrestore/ui/search/FilterManagementController.java b/...in/java/org/phoebus/applications/saveandrestore/ui/search/FilterManagementController.java
diff --git a/.../src/main/java/org/phoebus/applications/saveandrestore/ui/search/FilterManagementTab.java b/.../src/main/java/org/phoebus/applications/saveandrestore/ui/search/FilterManagementTab.java
diff --git a/...p/src/main/java/org/phoebus/applications/saveandrestore/ui/search/SearchAndFilterTab.java b/...p/src/main/java/org/phoebus/applications/saveandrestore/ui/search/SearchAndFilterTab.java
@@ -56,15 +56,6 @@ public SearchAndFilterTab(SaveAndRestoreController saveAndRestoreController) {
                     return clazz.getConstructor(SaveAndRestoreController.class)
                             .newInstance(saveAndRestoreController);
                 }
-                else if(clazz.isAssignableFrom(SearchWindowController.class)){
-                    return clazz.getConstructor().newInstance();
-                }
-                else if(clazz.isAssignableFrom(FilterManagementController.class)){
-                    return clazz.getConstructor().newInstance();
-                }
-                else if(clazz.isAssignableFrom(SearchQueryEditorController.class)){
-                    return clazz.getConstructor().newInstance();
-                }
             } catch (Exception e) {
                 Logger.getLogger(SearchAndFilterTab.class.getName()).log(Level.SEVERE, "Failed to instantiate SearchAndFilterViewController", e);
             }