[Libreoffice-commits] core.git: scripting/java xmerge/source

[Caolán McNamara]

 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java    |    5 +++++
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |    5 +++++
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java |    8 +++++++-
 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java |    8 +++++++-
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java     |    7 ++++++-
 5 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 5d5e14e97eafa22280250d5dab95c3228c68fb9a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 14 21:15:18 2015 +0100

    coverity#1326899 HE: Equal objects must have equal hashcodes
    
    and...
    
    coverity#1326898 HE: Equal objects must have equal hashcodes
    coverity#1326897 HE: Equal objects must have equal hashcodes
    coverity#1326896 HE: Equal objects must have equal hashcodes
    coverity#1326895 HE: Equal objects must have equal hashcodes
    
    Change-Id: Ic9cb7542c1bf0608a97e5b4756b737cdf1bb4bd8

diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
index 6020e81..ad98264 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptEntry.java
@@ -85,6 +85,11 @@ public class ScriptEntry implements Cloneable {
                location.equals(other.getLocation());
     }
 
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
     public Map<String, String> getLanguageProperties() {
         return languagedepprops;
     }
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 3841c18..75f0752 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -70,6 +70,11 @@ public class ScriptMetaData extends ScriptEntry {
         return super.equals(other) && hasSource == other.hasSource();
     }
 
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
     public String getScriptFullURL() {
         String url = "vnd.sun.star.script:" + parent.getName() + "."
                      + getLanguageName() + "?" + "language=" + getLanguage()
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
index 4c48e3fe..2f6ca01 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java
@@ -351,4 +351,10 @@ public final class PalmDB {
 
         return bool;
     }
-}
\ No newline at end of file
+
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
index cf9fad8..12d7a02 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/Record.java
@@ -167,4 +167,10 @@ public final class Record {
         }
         return false;
     }
-}
\ No newline at end of file
+
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
+}
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
index b797f3a8..74e95fb 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Difference.java
@@ -175,6 +175,11 @@ public final class Difference {
         return false;
     }
 
+    @Override
+    public int hashCode() {
+        return 0;
+    }
+
     /**
      * Display debug information.
      *
@@ -215,4 +220,4 @@ public final class Difference {
 
         return orgPosition + " " + modPosition + " " + operation;
     }
-}
\ No newline at end of file
+}