Skip to content

Rendering service.java bugfixes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reischlb merged 9 commits into from
Apr 19, 2017
Merged

Rendering service.java bugfixes #4

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
234f6a2
Removed code smell: Replace the type specification in this constructo…
BenjaminBako Apr 17, 2017
a2e2964
Removed code smell: Replace the type specification in this constructo…
BenjaminBako Apr 17, 2017
b19d0c4
Removed bug: Move the // string literal on the left side of this stri…
BenjaminBako Apr 17, 2017
19a7c42
Replace the synchronized class "StringBuffer" by an unsynchronized on…
BenjaminBako Apr 17, 2017
69c015a
Refactored switch block. Removed code smell and bug: Add a default ca…
BenjaminBako Apr 17, 2017
6002b5d
Removed code smell: Replace the type specification in this constructo…
BenjaminBako Apr 17, 2017
4cd2ad9
I removed the empty contructor from WriterDelegate innerclass
BenjaminBako Apr 17, 2017
677132c
Refactored my bug fix. And moved the called methods to its object
BenjaminBako Apr 18, 2017
f53c2ef
I added to end of if statement a ')' character.
BenjaminBako Apr 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions src/main/java/org/protege/owl/diff/service/RenderingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static ShortFormProvider getDefaultShortFormProvider(OWLOntology ontology
}

public static ShortFormProvider getShortFormProvider(OWLOntology ontology, List<OWLAnnotationProperty> annotationProperties, List<String> langs) {
Map<OWLAnnotationProperty, List<String>> preferredLanguageMap = new HashMap<OWLAnnotationProperty, List<String>>();
Map<OWLAnnotationProperty, List<String>> preferredLanguageMap = new HashMap<>();
for (OWLAnnotationProperty annotationProperty : annotationProperties) {
preferredLanguageMap.put(annotationProperty, langs);
}
Expand All @@ -77,11 +77,11 @@ 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<String> getDefaultLanguages() {
List<String> langs = new ArrayList<String>();
List<String> langs = new ArrayList<>();
Locale locale = Locale.getDefault();
if (locale != null && locale.getLanguage() != null && !locale.getLanguage().equals("")) {
if (locale != null && locale.getLanguage() != null && !"".equals(locale.getLanguage())) {
langs.add(locale.getLanguage());
if (locale.getCountry() != null && !locale.getCountry().equals("")) {
if (locale.getCountry() != null && !"".equals(locale.getCountry())) {
langs.add(locale.getLanguage() + "-" + locale.getCountry());
}
}
Expand Down Expand Up @@ -140,21 +140,16 @@ 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()) {
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;
}
Expand Down Expand Up @@ -192,8 +187,8 @@ public String getShortForm(IRI uri) {

public OWLEntity getTargetEntityByRendering(String rendering) {
if (targetNameToEntityMap == null) {
targetNameToEntityMap = new HashMap<String, OWLEntity>();
Set<String> toRemove = new TreeSet<String>();
targetNameToEntityMap = new HashMap<>();
Set<String> toRemove = new TreeSet<>();
for (OWLEntity e : engine.getOwlDiffMap().getTargetOntology().getSignature()) {
String eRendering = renderTargetObject(e);
if (eRendering == null) {
Expand All @@ -216,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();
}
Expand Down