Ticket #2203: linkshud.patch

modules/org.sophie2.main.func.links/src/main/java/org/sophie2/main/func/links/LinksHud.java

@@ -398 +398 @@
                                 protected void setup(JPanel res) {
                                         LinksHud hud = findParentElement(LinksHud.class);
                                         if (hud == null || hud.currentRule().get() == null
-                                                        || hud.currentRule().get().getAction() == null
-                                                        ) {
+                                                        || hud.currentRule().get().getAction() == null) {
+                                                this.currentPanel = null;
+                                                res.removeAll();
                                                 return;
                                         }
 
                                         LinkAction action = hud.currentRule().get().getAction();
-
+                                        ActionConfigurationPanel panelToAdd = null;
                                         for (ActionConfigurationPanel panel : configPanels().get()) {
                                                 if (panel.getActionClass() == action.getClass()
                                                                 && panel.swingComponent() != null) {
@@ -412 +413 @@
                                                         if (this.currentPanel == panel) {
                                                                 return;
                                                         }
-                                                        
-                                                        this.currentPanel = panel;
-                                                        
-                                                        res.removeAll();
-                                                        res.setBorder(new TitledBorder("Action Settings"));
-                                                        res.add(panel.swingComponent().get());
+
+                                                        panelToAdd = panel;
                                                         break;
                                                 }
                                         }
+
+                                        res.removeAll();
+                                        res.setBorder(new TitledBorder("Action Settings"));
+                                        this.currentPanel = panelToAdd;
+                                        if (this.currentPanel != null) {
+                                                res.add(this.currentPanel.swingComponent().get());
+                                        }
                                 }
                         }
                         return getBean().makeProp(swingComponent.class);

modules/org.sophie2.main.func.help/src/main/java/org/sophie2/main/func/help/bugreport/BugReportDialog.java

@@ -138 +138 @@
                                 bottomPanel.add(emailField().get().swingComponent().get());
 
                                 bottomPanel.add(saveButton().get().swingComponent().get());
+
+                                bottomPanel.add(sendButton().get().swingComponent().get());
                                 
                                 bottomPanel.add(cancelButton().get().swingComponent().get());
-
-                                bottomPanel.add(sendButton().get().swingComponent().get());
+                                
                                 res.add(bottomPanel);
 
                                 return res;