From 234f6a2e31050ec52709cc735b7577ed257c19c5 Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:07:41 +0200 Subject: [PATCH 1/9] Removed code smell: Replace the type specification in this constructor call with the diamond operator ( --- .../java/org/protege/owl/diff/service/RenderingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index 1c39a50..80d50dd 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -65,7 +65,7 @@ public static ShortFormProvider getDefaultShortFormProvider(OWLOntology ontology } public static ShortFormProvider getShortFormProvider(OWLOntology ontology, List annotationProperties, List langs) { - Map> preferredLanguageMap = new HashMap>(); + Map> preferredLanguageMap = new HashMap<>(); for (OWLAnnotationProperty annotationProperty : annotationProperties) { preferredLanguageMap.put(annotationProperty, langs); } From a2e2964c0e44118dd5499bad408c1575ba62be6e Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:22:55 +0200 Subject: [PATCH 2/9] Removed code smell: Replace the type specification in this constructor call with the diamond operator ( --- .../java/org/protege/owl/diff/service/RenderingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index 80d50dd..d01ef65 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -77,7 +77,7 @@ public static ShortFormProvider getShortFormProvider(OWLOntology ontology, List< * Pardon me - I am stealing this code from Protege 4. Dependencies make it unclear how to share it. */ public static List getDefaultLanguages() { - List langs = new ArrayList(); + List langs = new ArrayList<>(); Locale locale = Locale.getDefault(); if (locale != null && locale.getLanguage() != null && !locale.getLanguage().equals("")) { langs.add(locale.getLanguage()); From b19d0c433f1b60dcea196b040754874b70f2738e Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:26:19 +0200 Subject: [PATCH 3/9] Removed bug: Move the // string literal on the left side of this string comparison. --- .../java/org/protege/owl/diff/service/RenderingService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index d01ef65..b6641df 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -79,9 +79,9 @@ public static ShortFormProvider getShortFormProvider(OWLOntology ontology, List< public static List getDefaultLanguages() { List langs = new ArrayList<>(); Locale locale = Locale.getDefault(); - if (locale != null && locale.getLanguage() != null && !locale.getLanguage().equals("")) { + if (locale != null && locale.getLanguage() != null && !"".getLanguage().equals(locale)) { langs.add(locale.getLanguage()); - if (locale.getCountry() != null && !locale.getCountry().equals("")) { + if (locale.getCountry() != null && !"".getCountry().equals(locale)) { langs.add(locale.getLanguage() + "-" + locale.getCountry()); } } From 19a7c42aa721c75b8e78134ed14c8be16faa73cd Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:31:16 +0200 Subject: [PATCH 4/9] Replace the synchronized class "StringBuffer" by an unsynchronized one such as "StringBuilder". --- .../java/org/protege/owl/diff/service/RenderingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index b6641df..d56545e 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -140,7 +140,7 @@ public String renderTargetObject(OWLObject o) { } public String renderDiff(EntityBasedDiff diff) { - StringBuffer diffDescription = new StringBuffer(); + StringBuilder diffDescription = new StringBuilder(); diffDescription.append(diff.getDiffTypeDescription()); diffDescription.append(": "); switch (diff.getDiffType()) { From 69c015a6783b15380621608ced6893c3c41fe677 Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:42:16 +0200 Subject: [PATCH 5/9] Refactored switch block. Removed code smell and bug: Add a default case to this switch. --- .../org/protege/owl/diff/service/RenderingService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index d56545e..42ba182 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -147,14 +147,9 @@ public String renderDiff(EntityBasedDiff diff) { case CREATED: diffDescription.append(renderTargetObject(diff.getTargetEntity())); break; - case DELETED: - diffDescription.append(renderSourceObject(diff.getSourceEntity())); - break; case EQUIVALENT: break; - case MODIFIED: - case RENAMED: - case RENAMED_AND_MODIFIED: + default: diffDescription.append(renderSourceObject(diff.getSourceEntity())); break; } From 6002b5da142cc31f810e9163e015f4761f83ef02 Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:48:54 +0200 Subject: [PATCH 6/9] Removed code smell: Replace the type specification in this constructor call with the diamond operator ("<>"). --- .../java/org/protege/owl/diff/service/RenderingService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index 42ba182..90d4d4d 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -187,8 +187,8 @@ public String getShortForm(IRI uri) { public OWLEntity getTargetEntityByRendering(String rendering) { if (targetNameToEntityMap == null) { - targetNameToEntityMap = new HashMap(); - Set toRemove = new TreeSet(); + targetNameToEntityMap = new HashMap<>(); + Set toRemove = new TreeSet<>(); for (OWLEntity e : engine.getOwlDiffMap().getTargetOntology().getSignature()) { String eRendering = renderTargetObject(e); if (eRendering == null) { From 4cd2ad91b81f15774689fb77b3e68e3d48f21925 Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 01:53:22 +0200 Subject: [PATCH 7/9] I removed the empty contructor from WriterDelegate innerclass --- .../java/org/protege/owl/diff/service/RenderingService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index 90d4d4d..e9d5564 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -211,11 +211,7 @@ public OWLEntity getTargetEntityByRendering(String rendering) { private static class WriterDelegate extends Writer { private StringWriter delegate; - - public WriterDelegate() { - } - - + private void reset() { delegate = new StringWriter(); } From 677132c3303013ca307d5a1c449a7b7bfd7d73b0 Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 02:01:56 +0200 Subject: [PATCH 8/9] Refactored my bug fix. And moved the called methods to its object --- .../java/org/protege/owl/diff/service/RenderingService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index e9d5564..82a06ed 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -79,9 +79,9 @@ public static ShortFormProvider getShortFormProvider(OWLOntology ontology, List< public static List getDefaultLanguages() { List langs = new ArrayList<>(); Locale locale = Locale.getDefault(); - if (locale != null && locale.getLanguage() != null && !"".getLanguage().equals(locale)) { + if (locale != null && locale.getLanguage() != null && !"".equals(locale.getLanguage())) { langs.add(locale.getLanguage()); - if (locale.getCountry() != null && !"".getCountry().equals(locale)) { + if (locale.getCountry() != null && !"".equals(locale.getCountry()) { langs.add(locale.getLanguage() + "-" + locale.getCountry()); } } From f53c2ef9d9d56d2673b454220376b74b2819f805 Mon Sep 17 00:00:00 2001 From: Bako Andras Benjamin Date: Tue, 18 Apr 2017 02:37:48 +0200 Subject: [PATCH 9/9] I added to end of if statement a ')' character. --- .../java/org/protege/owl/diff/service/RenderingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/protege/owl/diff/service/RenderingService.java b/src/main/java/org/protege/owl/diff/service/RenderingService.java index 82a06ed..f171c70 100644 --- a/src/main/java/org/protege/owl/diff/service/RenderingService.java +++ b/src/main/java/org/protege/owl/diff/service/RenderingService.java @@ -81,7 +81,7 @@ public static List getDefaultLanguages() { Locale locale = Locale.getDefault(); if (locale != null && locale.getLanguage() != null && !"".equals(locale.getLanguage())) { langs.add(locale.getLanguage()); - if (locale.getCountry() != null && !"".equals(locale.getCountry()) { + if (locale.getCountry() != null && !"".equals(locale.getCountry())) { langs.add(locale.getLanguage() + "-" + locale.getCountry()); } }