Skip to content
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

Jump to bottom

Mark OOSTyle as invalid if no defaultStyle #5471

Merged
merged 6 commits into from
Oct 17, 2019
Merged

Mark OOSTyle as invalid if no defaultStyle #5471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf8dd0d
Valid OOStyle need to inlcude a default layout
Siedlerchr Oct 17, 2019
29c8fe7
fix semicolon
Siedlerchr Oct 17, 2019
852b487
Fix indent and rename var
Siedlerchr Oct 17, 2019
fafdad7
add changelog
Siedlerchr Oct 17, 2019
3a0e6af
Update CHANGELOG.md
tobiasdiez Oct 17, 2019
918b263
Update src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
Siedlerchr Oct 17, 2019
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
5 changes: 3 additions & 2 deletions src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.jabref.logic.openoffice.StyleLoader;
import org.jabref.logic.util.TestEntry;
import org.jabref.model.database.BibDatabaseContext;
import org.jabref.model.entry.types.StandardEntryType;
import org.jabref.preferences.PreferencesService;

import com.airhacks.afterburner.views.ViewLoader;
Expand Down Expand Up @@ -118,8 +119,8 @@ private void initialize() {

EasyBind.subscribe(viewModel.selectedItemProperty(), style -> {
tvStyles.getSelectionModel().select(style);
previewArticle.setLayout(new TextBasedPreviewLayout(style.getStyle().getDefaultBibLayout()));
previewBook.setLayout(new TextBasedPreviewLayout(style.getStyle().getDefaultBibLayout()));
previewArticle.setLayout(new TextBasedPreviewLayout(style.getStyle().getReferenceFormat(StandardEntryType.Article)));
previewBook.setLayout(new TextBasedPreviewLayout(style.getStyle().getReferenceFormat(StandardEntryType.Book)));
});
}

Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
private File styleFile;
private long styleFileModificationTime = Long.MIN_VALUE;
private String localCopy;
private boolean setDefault;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you rename the variable to setDefaultLayout or smething?

Currently, the name is not that readable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes yes yes, I knew it. In the pipeline

public OOBibStyle(File styleFile, LayoutFormatterPreferences prefs,
Charset encoding) throws IOException {
this.prefs = Objects.requireNonNull(prefs);
Expand All @@ -143,7 +144,7 @@ public OOBibStyle(String resourcePath, LayoutFormatterPreferences prefs) throws
}

public Layout getDefaultBibLayout() {
return defaultBibLayout;
return defaultBibLayout ;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the added space

}

private void setDefaultProperties() {
Expand Down Expand Up @@ -272,7 +273,7 @@ private void readFormatFile(Reader in) throws IOException {
if (!line.isEmpty() && (line.charAt(line.length() - 1) == '\r')) {
line = line.substring(0, line.length() - 1);
}
// Check for empty line or comment:
// Check for empty lin e or comment:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this change

Siedlerchr marked this conversation as resolved.
Show resolved Hide resolved
if (line.trim().isEmpty() || (line.charAt(0) == '#')) {
continue;
}
Expand Down Expand Up @@ -321,13 +322,11 @@ private void readFormatFile(Reader in) throws IOException {
}

}

// Set validity boolean based on whether we found anything interesting
// in the file:
if (mode != BibStyleMode.NONE) {
if ((mode != BibStyleMode.NONE) && setDefault) {
valid = true;
}

}

/**
Expand All @@ -350,7 +349,7 @@ private void handleStructureLine(String line) {
int index = line.indexOf('=');
if ((index > 0) && (index < (line.length() - 1))) {
String formatString = line.substring(index + 1);
boolean setDefault = line.substring(0, index).equals(OOBibStyle.DEFAULT_MARK);
setDefault = line.substring(0, index).equals(OOBibStyle.DEFAULT_MARK);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the ident

EntryType type = EntryTypeFactory.parse(line.substring(0, index));
try {
Layout layout = new LayoutHelper(new StringReader(formatString), this.prefs).getLayoutFromText();
Expand Down