Removed a few Coverity warnings

JabRef · Jan 31, 2016 · 9d9d466 · 9d9d466
1 parent 0a4058d
commit 9d9d466
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/main/java/net/sf/jabref/openoffice/OOBibStyle.java b/src/main/java/net/sf/jabref/openoffice/OOBibStyle.java
@@ -238,21 +238,22 @@ private void readFormatFile(Reader in) throws IOException {
             }
 
             switch (mode) {
-                case NAME:
-                    if (!line.trim().isEmpty()) {
-                        name = line.trim();
-                    }
-                case LAYOUT:
-                    handleStructureLine(line);
-                    break;
-                case PROPERTIES:
-                    handlePropertiesLine(line, properties);
-                    break;
-                case CITATION:
-                    handlePropertiesLine(line, citProperties);
-                    break;
-                case JOURNALS:
-                    handleJournalsLine(line);
+            case NAME:
+                if (!line.trim().isEmpty()) {
+                    name = line.trim();
+                }
+                break;
+            case LAYOUT:
+                handleStructureLine(line);
+                break;
+            case PROPERTIES:
+                handlePropertiesLine(line, properties);
+                break;
+            case CITATION:
+                handlePropertiesLine(line, citProperties);
+                break;
+            case JOURNALS:
+                handleJournalsLine(line);
             }
 
         }
@@ -494,7 +495,7 @@ public String getCitationMarker(BibEntry[] entries, BibDatabase database, boolea
                         String author = getCitationMarkerField(entries[i], database, authorField);
                         AuthorList al = AuthorList.getAuthorList(author);
                         //System.out.println("i="+i+" thisMarker='"+thisMarker+"'");
-                        int prevALim = i > 0 ? unlimAuthors[i - 1] : unlimAuthors[0];
+                        int prevALim = unlimAuthors[i - 1]; // i always at least 1 here
                         if (!thisMarker.equals(tmpMarker)
                                 || ((al.size() > maxAuthors) && (unlimAuthors[i] != prevALim))) {
                             // No match. Update piv to exclude the previous entry. But first check if the
@@ -891,9 +892,10 @@ public int compareTo(OOBibStyle other) {
     public boolean equals(Object o) {
         if (o == null) {
             return false;
-        } else {
+        } else if (o instanceof OOBibStyle) {
             return styleFile.equals(((OOBibStyle) o).styleFile);
         }
+        return false;
     }
 
     @Override