More updates to localization provided by Ruslan Uss.

[debian/openrocket] / core / src / net / sf / openrocket / aerodynamics / Warning.java

diff --git a/core/src/net/sf/openrocket/aerodynamics/Warning.java b/core/src/net/sf/openrocket/aerodynamics/Warning.java
index 355a2b8762fcab3eba0c2573e5f677b341e6f8dc..363606d722c7984a446b191842ceb0d452640083 100644 (file)
--- a/core/src/net/sf/openrocket/aerodynamics/Warning.java
+++ b/core/src/net/sf/openrocket/aerodynamics/Warning.java
@@ -102,6 +102,7 @@ public abstract class Warning {
                private double length = Double.NaN;
                private double delay = Double.NaN;
 
+               @Override
                public String toString() {
                        String str = "No motor with designation '" + designation + "'";
                        if (manufacturer != null)
@@ -184,6 +185,65 @@ public abstract class Warning {
                public boolean replaceBy(Warning other) {
                        return false;
                }
+
+               @Override
+               public int hashCode() {
+                       final int prime = 31;
+                       int result = super.hashCode();
+                       long temp;
+                       temp = Double.doubleToLongBits(delay);
+                       result = prime * result + (int) (temp ^ (temp >>> 32));
+                       result = prime * result
+                                       + ((designation == null) ? 0 : designation.hashCode());
+                       temp = Double.doubleToLongBits(diameter);
+                       result = prime * result + (int) (temp ^ (temp >>> 32));
+                       result = prime * result
+                                       + ((digest == null) ? 0 : digest.hashCode());
+                       temp = Double.doubleToLongBits(length);
+                       result = prime * result + (int) (temp ^ (temp >>> 32));
+                       result = prime * result
+                                       + ((manufacturer == null) ? 0 : manufacturer.hashCode());
+                       result = prime * result + ((type == null) ? 0 : type.hashCode());
+                       return result;
+               }
+
+               @Override
+               public boolean equals(Object obj) {
+                       if (this == obj)
+                               return true;
+                       if (!super.equals(obj))
+                               return false;
+                       if (getClass() != obj.getClass())
+                               return false;
+                       MissingMotor other = (MissingMotor) obj;
+                       if (Double.doubleToLongBits(delay) != Double
+                                       .doubleToLongBits(other.delay))
+                               return false;
+                       if (designation == null) {
+                               if (other.designation != null)
+                                       return false;
+                       } else if (!designation.equals(other.designation))
+                               return false;
+                       if (Double.doubleToLongBits(diameter) != Double
+                                       .doubleToLongBits(other.diameter))
+                               return false;
+                       if (digest == null) {
+                               if (other.digest != null)
+                                       return false;
+                       } else if (!digest.equals(other.digest))
+                               return false;
+                       if (Double.doubleToLongBits(length) != Double
+                                       .doubleToLongBits(other.length))
+                               return false;
+                       if (manufacturer == null) {
+                               if (other.manufacturer != null)
+                                       return false;
+                       } else if (!manufacturer.equals(other.manufacturer))
+                               return false;
+                       if (type != other.type)
+                               return false;
+                       return true;
+               }
                
        }
        
@@ -256,4 +316,13 @@ public abstract class Warning {
        //// Invalid parameter encountered, ignoring.
        public static final Warning FILE_INVALID_PARAMETER =
                new Other(trans.get("Warning.FILE_INVALID_PARAMETER"));
+
+       public static final Warning PARALLEL_FINS =
+               new Other(trans.get("Warning.PARALLEL_FINS"));
+       
+       public static final Warning SUPERSONIC =
+               new Other(trans.get("Warning.SUPERSONIC"));
+
+       public static final Warning RECOVERY_LAUNCH_ROD =
+               new Other(trans.get("Warning.RECOVERY_LAUNCH_ROD"));
 }