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

Merge pull request #691 from teyrana/fix/doc

Browse Source 
[fix] made string -> hashcode conversion explicit, to placate IDE warnings
This commit is contained in:
Daniel Williams 2020-07-04 12:43:13 -04:00 committed by GitHub
commit 123732a878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/masscalc/MassCalculation.java
View File

@ -239,7 +239,7 @@ public class MassCalculation {
addMass( clusterCM ); addMass( clusterCM );
if(null != this.analysisMap) { if(null != this.analysisMap) {
CMAnalysisEntry entry = analysisMap.get(motor.getDesignation()); CMAnalysisEntry entry = analysisMap.get(motor.getDesignation().hashCode());
if (null == entry){ if (null == entry){
entry = new CMAnalysisEntry(motor); entry = new CMAnalysisEntry(motor);
analysisMap.put(motor.getDesignation().hashCode(), entry); analysisMap.put(motor.getDesignation().hashCode(), entry);

2
swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
View File

@ -579,7 +579,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
} }
for(final MotorConfiguration config: configuration.getActiveMotors()) { for(final MotorConfiguration config: configuration.getActiveMotors()) {
CMAnalysisEntry cmEntry = cmMap.get(config.getMotor().getDesignation()); CMAnalysisEntry cmEntry = cmMap.get(config.getMotor().getDesignation().hashCode());
if (null == cmEntry) { if (null == cmEntry) {
continue; continue;
} }