includes suggestions from John May

#36 Signed-off-by: John May <john.wilkinsonmay@gmail.com>
cdk · Aug 4, 2014 · f5374a0 · f5374a0
1 parent 3450bf1
commit f5374a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/storage/ioformats/src/main/java/org/openscience/cdk/io/formats/MOPAC2007Format.java b/storage/ioformats/src/main/java/org/openscience/cdk/io/formats/MOPAC2007Format.java
@@ -1,9 +1,5 @@
-/* $RCSfile$
- * $Author$
- * $Date$
- * $Revision$
- *
- * Copyright (C) 2004-2007  The Chemistry Development Kit (CDK) project
+/*
+ * Copyright (C) 2014  The Chemistry Development Kit (CDK) project
  *
  * Contact: cdk-devel@lists.sourceforge.net
  *
@@ -80,10 +76,7 @@ public String[] getNameExtensions() {
     /** {@inheritDoc} */ @Override
     @TestMethod("testMatches")
     public boolean matches(int lineNumber, String line) {
-        if (line.indexOf("MOPAC2007") >= 0) {
-            return true;
-        }
-        return false;
+        return line.contains("MOPAC2007");
     }
 
     /** {@inheritDoc} */ @Override

diff --git a/storage/ioformats/src/main/java/org/openscience/cdk/io/formats/MOPAC2009Format.java b/storage/ioformats/src/main/java/org/openscience/cdk/io/formats/MOPAC2009Format.java
@@ -1,9 +1,5 @@
-/* $RCSfile$
- * $Author$
- * $Date$
- * $Revision$
- *
- * Copyright (C) 2004-2007  The Chemistry Development Kit (CDK) project
+/*
+ * Copyright (C) 2014  The Chemistry Development Kit (CDK) project
  *
  * Contact: cdk-devel@lists.sourceforge.net
  *
@@ -80,10 +76,7 @@ public String[] getNameExtensions() {
     /** {@inheritDoc} */ @Override
     @TestMethod("testMatches")
     public boolean matches(int lineNumber, String line) {
-        if (line.indexOf("MOPAC2009") >= 0) {
-            return true;
-        }
-        return false;
+        return line.contains("MOPAC2009");
     }
 
     /** {@inheritDoc} */ @Override

diff --git a/storage/ioformats/src/main/java/org/openscience/cdk/io/formats/MOPAC2012Format.java b/storage/ioformats/src/main/java/org/openscience/cdk/io/formats/MOPAC2012Format.java
@@ -1,9 +1,5 @@
-/* $RCSfile$
- * $Author$
- * $Date$
- * $Revision$
- *
- * Copyright (C) 2004-2007  The Chemistry Development Kit (CDK) project
+/*
+ * Copyright (C) 2014  The Chemistry Development Kit (CDK) project
  *
  * Contact: cdk-devel@lists.sourceforge.net
  *
@@ -78,12 +74,9 @@ public String[] getNameExtensions() {
     public String getWriterClassName() { return null; }
 
     /** {@inheritDoc} */ @Override
-    @TestMethod("testMatches")
+    @TestMethod("matchesMopac2012")
     public boolean matches(int lineNumber, String line) {
-        if (line.indexOf("MOPAC2012") >= 0) {
-            return true;
-        }
-        return false;
+        return line.contains("MOPAC2012");
     }
 
     /** {@inheritDoc} */ @Override