fix checkstyle and OO test

Ognimalf · Jul 20, 2022 · bd37b6c · bd37b6c
1 parent 627593d
commit bd37b6c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 54 deletions.
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
@@ -11,9 +11,9 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.model.entry.types.BiblatexAPAEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexSoftwareEntryTypeDefinitions;
-import org.jabref.model.entry.types.BiblatexAPAEntryTypeDefinitions;
 import org.jabref.model.entry.types.BibtexEntryTypeDefinitions;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;

diff --git a/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
@@ -48,13 +48,14 @@ public enum BiblatexApaField implements Field {
     }
 
     public static <T> Optional<BiblatexApaField> fromName(T type, String name) {
-        if(!(type instanceof BiblatexApaEntryType)) {
+        if (!(type instanceof BiblatexApaEntryType)) {
             return Optional.empty();
         }
         return Arrays.stream(BiblatexApaField.values())
                      .filter(field -> field.getName().equalsIgnoreCase(name))
                      .findAny();
     }
+
     @Override
     public Set<FieldProperty> getProperties() {
         return Collections.unmodifiableSet(properties);

diff --git a/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
@@ -47,14 +47,15 @@ public enum BiblatexSoftwareField implements Field {
         this.properties = EnumSet.of(first, rest);
     }
 
-    public static<T> Optional<BiblatexSoftwareField> fromName(T type, String name) {
-        if(!(type instanceof BiblatexSoftwareEntryType)) {
+    public static <T> Optional<BiblatexSoftwareField> fromName(T type, String name) {
+        if (!(type instanceof BiblatexSoftwareEntryType)) {
             return Optional.empty();
         }
         return Arrays.stream(BiblatexSoftwareField.values())
                      .filter(field -> field.getName().equalsIgnoreCase(name))
                      .findAny();
     }
+
     @Override
     public Set<FieldProperty> getProperties() {
         return Collections.unmodifiableSet(properties);

diff --git a/src/main/java/org/jabref/model/entry/field/FieldFactory.java b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -83,14 +83,13 @@ public static <T> Field parseField(T type, String fieldName) {
               StandardField.fromName(fieldName)),
               SpecialField.fromName(fieldName)),
               IEEEField.fromName(fieldName)),
-              BiblatexSoftwareField.fromName(type,fieldName)),
+              BiblatexSoftwareField.fromName(type, fieldName)),
               BiblatexApaField.fromName(type, fieldName))
               .orElse(new UnknownField(fieldName));
     }
 
     public static Field parseField(String fieldName) {
         return parseField(null, fieldName);
-
     }
 
     public static Set<Field> getKeyFields() {

diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -90,6 +90,10 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception
         Input.Builder control = Input.from(Files.newInputStream(xmlFile));
         Input.Builder test = Input.from(Files.newInputStream(contentXmlPath));
 
+        // for debugging purposes
+       // Path testPath = xmlFile.resolveSibling("test.xml");
+       // Files.copy(Files.newInputStream(contentXmlPath), testPath, StandardCopyOption.REPLACE_EXISTING);
+
         assertThat(test, CompareMatcher.isSimilarTo(control)
                                        .normalizeWhitespace()
                                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());

diff --git a/...t/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml b/...t/resources/org/jabref/logic/exporter/OldOpenOfficeCalcExportFormatContentSingleEntry.xml
@@ -150,12 +150,6 @@
                 <table:table-cell>
                     <text:p>Gender</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Hal_id</text:p>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p>Hal_version</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Holder</text:p>
                 </table:table-cell>
@@ -171,9 +165,6 @@
                 <table:table-cell>
                     <text:p>Introduction</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Introducedin</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>ISBN</text:p>
                 </table:table-cell>
@@ -216,9 +207,6 @@
                 <table:table-cell>
                     <text:p>Library</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>License</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Location</text:p>
                 </table:table-cell>
@@ -291,18 +279,9 @@
                 <table:table-cell>
                     <text:p>Related</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Relatedtype</text:p>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p>Relatedstring</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Reportno</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Repository</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Review</text:p>
                 </table:table-cell>
@@ -333,9 +312,6 @@
                 <table:table-cell>
                     <text:p>Subtitle</text:p>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p>Swhid</text:p>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Title</text:p>
                 </table:table-cell>
@@ -566,15 +542,6 @@
                 <table:table-cell>
                     <text:p/>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>0097-8418</text:p>
                 </table:table-cell>
@@ -638,9 +605,6 @@
                 <table:table-cell>
                     <text:p/>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>4</text:p>
                 </table:table-cell>
@@ -719,18 +683,6 @@
                 <table:table-cell>
                     <text:p/>
                 </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
-                <table:table-cell>
-                    <text:p/>
-                </table:table-cell>
                 <table:table-cell>
                     <text:p>Design and usability in security systems: daily life as a context of use?</text:p>
                 </table:table-cell>