Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...

diff --cc net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java
Simple merge

diff --cc net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
index 06f9f4b,2827f24..28e2855
--- 1/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
--- 2/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
+++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java
@@@ -1,5 -1,5 +1,7 @@@
  package net.mograsim.logic.model.editor.ui;
  
++import java.io.IOException;
++
  import org.eclipse.swt.SWT;
  import org.eclipse.swt.events.SelectionEvent;
  import org.eclipse.swt.events.SelectionListener;
@@@ -81,33 -67,7 +83,41 @@@ public class EditorGU
                new ZoomableCanvasOverlay(logicCanvas, null).enableScale();
        }
  
 -      private ToolBar setupToolBar()
 +      private ToolBar setupTopToolBar(Composite parent)
 +      {
 +              GridData d = new GridData();
 +              d.grabExcessHorizontalSpace = true;
 +              d.horizontalAlignment = SWT.FILL;
 +
 +              ToolBar toolBar = new ToolBar(parent, SWT.BORDER);
 +              toolBar.setLayoutData(d);
 +
 +              ToolItem file = new ToolItem(toolBar, SWT.DROP_DOWN);
 +
 +              //TODO
 +//            DropDownEntry newEntry = new DropDownEntry("New", e -> {
 +//            });
-               DropDownEntry loadEntry = new DropDownEntry("Load", e -> SaveLoadManager.openLoadDialog());
++              DropDownEntry loadEntry = new DropDownEntry("Load", e -> {
++                      try
++                      {
++                              SaveLoadManager.openLoadDialog();
++                      } catch (IOException e1)
++                      {
++                              editor.dialogManager.openWarningDialog("Failed to load Component!", e1.getMessage());
++                      }
++              });
 +              DropDownEntry saveEntry = new DropDownEntry("Save", e -> editor.save());
 +              DropDownEntry saveAsEntry = new DropDownEntry("Save as...", e -> editor.saveAs());
 +              
 +              DropDownEntry[] entries = new DropDownEntry[] { loadEntry, saveEntry, saveAsEntry};
 +              
 +              setupDrowpDownMenu(file, entries);
 +              
 +              file.setText("File");
 +              return toolBar;
 +      }
 +
 +      private ToolBar setupBottomToolBar(Composite parent)
        {
                GridData d = new GridData();
                d.grabExcessHorizontalSpace = true;