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

Revert "fixed 4 bugs found by FindBugs plugin in Eclipse"

Browse Source 
This reverts commit 69130292f2edd7719f0b2dea9913796fa3d41461.
This commit is contained in:
soupwizard 2013-04-17 14:44:13 -07:00
parent 92952316ed
commit 0acc9595c8
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
View File

@ -117,7 +117,7 @@ public abstract class ComponentPresetDatabase extends Database<ComponentPreset>
@Override @Override
public List<ComponentPreset> listForTypes( List<ComponentPreset.Type> types ) { public List<ComponentPreset> listForTypes( List<ComponentPreset.Type> types ) {
blockUntilLoaded(); blockUntilLoaded();
return listForTypes( types.toArray(new ComponentPreset.Type[types.size()]) ); return listForTypes( (ComponentPreset.Type[]) types.toArray() );
} }
@Override @Override

2
core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
View File

@ -49,7 +49,7 @@ public class RocketSaver extends RocketComponentSaver {
if (id.equals(defId)) if (id.equals(defId))
str += " default=\"true\""; str += " default=\"true\"";
if (rocket.getMotorConfigurationName(id).isEmpty()) { if (rocket.getMotorConfigurationName(id) == "") {
str += "/>"; str += "/>";
} else { } else {
str += "><name>" + net.sf.openrocket.file.RocketSaver.escapeXML(rocket.getMotorConfigurationName(id)) str += "><name>" + net.sf.openrocket.file.RocketSaver.escapeXML(rocket.getMotorConfigurationName(id))

3
core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java
View File

@ -6,7 +6,6 @@ import java.beans.PropertyChangeListener;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.EventObject; import java.util.EventObject;
import java.util.List; import java.util.List;
@ -300,7 +299,7 @@ public class BooleanModel extends AbstractAction implements StateChangeListener,
PropertyChangeListener[] listeners = this.getPropertyChangeListeners(); PropertyChangeListener[] listeners = this.getPropertyChangeListeners();
if (listeners.length > 0) { if (listeners.length > 0) {
log.warn("Invalidating " + this + " while still having listeners " + Arrays.toString(listeners)); log.warn("Invalidating " + this + " while still having listeners " + listeners);
for (PropertyChangeListener l : listeners) { for (PropertyChangeListener l : listeners) {
this.removePropertyChangeListener(l); this.removePropertyChangeListener(l);
} }

2
core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
View File

@ -670,7 +670,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
// Check whether data is already up to date // Check whether data is already up to date
if (flightDataFunctionalID == configuration.getRocket().getFunctionalModID() && if (flightDataFunctionalID == configuration.getRocket().getFunctionalModID() &&
flightDataMotorID.equals(configuration.getMotorConfigurationID())) { flightDataMotorID == configuration.getMotorConfigurationID()) {
return; return;
} }