From 0b1e01137a6828f09e494a50c37e61824c220d55 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 8 Apr 2018 11:25:48 -0400 Subject: [PATCH 1/2] [Resolves #397][Workaround] Hides the Component Analysis Dialog until it can be fixed. --- .../sf/openrocket/gui/main/BasicFrame.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 4d64eb138..53a169e77 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -684,18 +684,20 @@ public class BasicFrame extends JFrame { menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc")); menubar.add(menu); - //// Component analysis - item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C); - //// Analyze the rocket components separately - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc")); - item.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - log.info(Markers.USER_MARKER, "Component analysis selected"); - ComponentAnalysisDialog.showDialog(rocketpanel); - } - }); - menu.add(item); + +// TODO: reimplement this +// //// Component analysis +// item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C); +// //// Analyze the rocket components separately +// item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc")); +// item.addActionListener(new ActionListener() { +// @Override +// public void actionPerformed(ActionEvent e) { +// log.info(Markers.USER_MARKER, "Component analysis selected"); +// ComponentAnalysisDialog.showDialog(rocketpanel); +// } +// }); +// menu.add(item); //// Optimize item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); From 32aa32da15a9866b1021672e512e417e29525af1 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 8 Apr 2018 11:29:46 -0400 Subject: [PATCH 2/2] [Workaround] Hides the Optimization Dialog until it can be fixed --- .../sf/openrocket/gui/main/BasicFrame.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 53a169e77..b4b100f2c 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -699,17 +699,18 @@ public class BasicFrame extends JFrame { // }); // menu.add(item); - //// Optimize - item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); - item.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - log.info(Markers.USER_MARKER, "Rocket optimization selected"); - new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true); - } - }); - menu.add(item); +// TODO: reimplement this dialog +// //// Optimize +// item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); +// item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); +// item.addActionListener(new ActionListener() { +// @Override +// public void actionPerformed(ActionEvent e) { +// log.info(Markers.USER_MARKER, "Rocket optimization selected"); +// new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true); +// } +// }); +// menu.add(item); //// Custom expressions item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E);