hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #739 from teyrana/fix/699-select-stage

Browse Source 
[fix] resolves issue #699,  fixes PR #738, which only partially selected the first stage
This commit is contained in:
Daniel Williams 2020-08-09 11:07:00 -04:00 committed by GitHub
commit 1eeef10a5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -60,6 +60,7 @@ import javax.swing.tree.DefaultTreeSelectionModel;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreeSelectionModel;
import net.sf.openrocket.rocketcomponent.AxialStage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -263,6 +264,18 @@ public class BasicFrame extends JFrame {
}); });
frames.add(this); frames.add(this);
if( componentSelectionModel.isSelectionEmpty() ){
final Rocket rocket = document.getRocket();
if( rocket != null ) {
final AxialStage topStage = (AxialStage) rocket.getChild(0);
if (topStage != null) {
final TreePath selectionPath = new TreePath(topStage);
componentSelectionModel.setSelectionPath(selectionPath);
tree.setSelectionRow(1);
log.debug("... Setting Initial Selection: " + tree.getSelectionPath() );
}
}
}
log.debug("BasicFrame instantiation complete"); log.debug("BasicFrame instantiation complete");
} }
@ -282,9 +295,6 @@ public class BasicFrame extends JFrame {
tree = new ComponentTree(document); tree = new ComponentTree(document);
tree.setSelectionModel(componentSelectionModel); tree.setSelectionModel(componentSelectionModel);
if( tree.isSelectionEmpty() ){
tree.setSelectionRow(1);
}
// Remove JTree key events that interfere with menu accelerators // Remove JTree key events that interfere with menu accelerators
InputMap im = SwingUtilities.getUIInputMap(tree, JComponent.WHEN_FOCUSED); InputMap im = SwingUtilities.getUIInputMap(tree, JComponent.WHEN_FOCUSED);