library is cleared if new file is opened

hneemann · Jul 11, 2016 · edd1b8e · edd1b8e
1 parent 288b013
commit edd1b8e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/de/neemann/digital/gui/LibrarySelector.java b/src/main/java/de/neemann/digital/gui/LibrarySelector.java
@@ -89,10 +89,7 @@ public void actionPerformed(ActionEvent e) {
         customMenu.add(new ToolTipAction(Lang.get("menu_refresh")) {
             @Override
             public void actionPerformed(ActionEvent e) {
-                for (ImportedItem item : importedElements) {
-                    library.removeElement(item.file);
-                    customMenu.remove(item.menuEntry);
-                }
+                removeCustomElements();
             }
         }.setToolTip(Lang.get("menu_refresh_tt")).createJMenuItem());
 
@@ -114,6 +111,16 @@ public void actionPerformed(ActionEvent e) {
         return parts;
     }
 
+    /**
+     * removes all custom elements
+     */
+    public void removeCustomElements() {
+        for (ImportedItem item : importedElements) {
+            library.removeElement(item.file);
+            customMenu.remove(item.menuEntry);
+        }
+    }
+
     private String createToolTipText(String elementName) {
         String toolTipText = Lang.getNull("elem_" + elementName + "_tt");
         if (toolTipText == null)

diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
@@ -279,6 +279,7 @@ public void actionPerformed(ActionEvent e) {
                     setFilename(null, true);
                     circuitComponent.setCircuit(new Circuit());
                     windowPosManager.closeAll();
+                    librarySelector.removeCustomElements();
                 }
             }
         }.setActive(normalMode);
@@ -289,6 +290,7 @@ public void actionPerformed(ActionEvent e) {
                 if (ClosingWindowListener.checkForSave(Main.this, Main.this)) {
                     JFileChooser fc = getJFileChooser(lastFilename);
                     if (fc.showOpenDialog(Main.this) == JFileChooser.APPROVE_OPTION) {
+                        librarySelector.removeCustomElements();
                         loadFile(fc.getSelectedFile(), true);
                     }
                 }
@@ -776,6 +778,7 @@ public void saveChanges() {
 
     @Override
     public void open(File file) {
+        librarySelector.removeCustomElements();
         loadFile(file, true);
     }