Skip to content

Persist OO Style choice (& Change OO Style Architecture)#7

Closed
subhramit wants to merge 59 commits into
oo-cslfrom
oo-architecture
Closed

Persist OO Style choice (& Change OO Style Architecture)#7
subhramit wants to merge 59 commits into
oo-cslfrom
oo-architecture

Conversation

@subhramit

@subhramit subhramit commented Jul 13, 2024

Copy link
Copy Markdown
Owner

Grounds for upcoming preferences PR (#6)
For the final PR, visit JabRef#11521

Mandatory checks

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
@subhramit subhramit mentioned this pull request Jul 13, 2024
6 tasks
Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
koppor and others added 11 commits July 15, 2024 02:20
Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>
Update Gradle Wrapper from 8.8 to 8.9
* Update FAQs

* Remove trailing space

* Apply review changes

* Update docs/code-howtos/faq.md

---------

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
…abRef#11495)

Bumps [org.openrewrite.recipe:rewrite-recipe-bom](https://github.com/openrewrite/rewrite-recipe-bom) from 2.14.0 to 2.15.0.
- [Release notes](https://github.com/openrewrite/rewrite-recipe-bom/releases)
- [Commits](openrewrite/rewrite-recipe-bom@v2.14.0...v2.15.0)

---
updated-dependencies:
- dependency-name: org.openrewrite.recipe:rewrite-recipe-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…0.0 (JabRef#11496)

Bumps [com.kohlschutter.junixsocket:junixsocket-mysql](https://github.com/kohlschutter/junixsocket) from 2.9.1 to 2.10.0.
- [Release notes](https://github.com/kohlschutter/junixsocket/releases)
- [Commits](kohlschutter/junixsocket@junixsocket-2.9.1...junixsocket-2.10.0)

---
updated-dependencies:
- dependency-name: com.kohlschutter.junixsocket:junixsocket-mysql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.17.2 to 1.18.1.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md)
- [Commits](jhy/jsoup@jsoup-1.17.2...jsoup-1.18.1)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps commons-logging:commons-logging from 1.3.2 to 1.3.3.

---
updated-dependencies:
- dependency-name: commons-logging:commons-logging
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
….0 (JabRef#11498)

Bumps [com.kohlschutter.junixsocket:junixsocket-core](https://github.com/kohlschutter/junixsocket) from 2.9.1 to 2.10.0.
- [Release notes](https://github.com/kohlschutter/junixsocket/releases)
- [Commits](kohlschutter/junixsocket@junixsocket-2.9.1...junixsocket-2.10.0)

---
updated-dependencies:
- dependency-name: com.kohlschutter.junixsocket:junixsocket-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [gittools/actions](https://github.com/gittools/actions) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/gittools/actions/releases)
- [Commits](GitTools/actions@v1.1.1...v1.2.0)

---
updated-dependencies:
- dependency-name: gittools/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…f#11501)

Bumps [src/main/resources/csl-styles](https://github.com/citation-style-language/styles) from `b2be5ae` to `fd6cb3e`.
- [Release notes](https://github.com/citation-style-language/styles/releases)
- [Commits](citation-style-language/styles@b2be5ae...fd6cb3e)

---
updated-dependencies:
- dependency-name: src/main/resources/csl-styles
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Siedlerchr

Copy link
Copy Markdown
Collaborator

codewise goes already in the right direction

Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
subhramit and others added 3 commits July 15, 2024 19:26
* Finish CSL Style selection Tab

* Preview Section (To Diagnose)

* Rename preview boxes

* Fixed CSL Style Preview as per suggestions

* Resize CSL Prveiw box height, Comply with Checkstyle

* IntelliJ refactoring & Add back filter functionality

* Draft Commit: Establish Basic Framework

* Draft Commit: Establish Basic Framework

* Connect UI with CSL Logic (Phase 1), Improve HTML Formatter (Phase 2), Cleanup

* Add logging of Cited Style Name for Testing

* Add preliminary test support for in-text citations

* Refine Implementation: Refactoring [1]

* Improve Logging

* Major CSL Formatting improvements

* Fix test, OpenRewrite

* Remove in-text citation test

* Fix architecture test: Move business logic from model to logic directory

* Fix order of imports

* Extend CSL Citation feature to manually selected library entries

* Don't assume Databasecontext

* Major bug fix: Using Filter Seelcted entries from start (Use name instead of index, basis for preferences)

* Implement extensible selection of Style categories, Reconnect JStyle pipeline

* Proper notification of selected style

* Separation of bibliographic and in-text citation handling

* Log instead of throwing exceptions while citing

* Handle the case of margins (gap between citation number and text)

* Refactoring, Localization

* Changelog

* RewriteRun

* Add ADR for Style Type Selection Problem

* Remove unused localization

* Fix markdown error

* Remove comment

* remove csl submodules

* Resolve submodules

* gitmodules

* Recover gitmodules

* recover gitmodules

* Recovery attempt

* fix submodules

* Add double click to select CSL style functionality

* Add double-click to select CSL style feature

* Adjust changelog

* Optimize transformHtml

* Add parameterized logging

* Remove thrown exception, replace by logger

* Add a return statement (enforced)

* Remove unused fields

* openRewrite

* Remove boilerplate comment

---------

Co-authored-by: Siedlerchr <siedlerkiller@gmail.com>
Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java
subhramit and others added 4 commits July 19, 2024 22:06
* upstream/main:
  Fix NPE when saving preferences (JabRef#11509)
  Switch to stream-based loading (JabRef#11479)
  Save unlinked local files dialog prefs (JabRef#11493)
  Add minimal support for biblatex data annotations (JabRef#11506)
  Fix handling of relative-file storage and auto linking (JabRef#11492)
  New Crowdin updates (JabRef#11504)
  Add missing issue numbers
  CSL4LibreOffice - A [GSoC '24] (JabRef#11477)
  Bump src/main/resources/csl-styles from `b2be5ae` to `fd6cb3e` (JabRef#11501)
  Bump gittools/actions from 1.1.1 to 1.2.0 (JabRef#11500)
  Bump com.kohlschutter.junixsocket:junixsocket-core from 2.9.1 to 2.10.0 (JabRef#11498)
  Bump commons-logging:commons-logging from 1.3.2 to 1.3.3 (JabRef#11499)
  Bump org.jsoup:jsoup from 1.17.2 to 1.18.1 (JabRef#11497)
  Bump com.kohlschutter.junixsocket:junixsocket-mysql from 2.9.1 to 2.10.0 (JabRef#11496)
  Bump org.openrewrite.recipe:rewrite-recipe-bom from 2.14.0 to 2.15.0 (JabRef#11495)
  FAQ updates (JabRef#11486)
  Update Gradle Wrapper from 8.8 to 8.9.
  Fix Chocolate.bib (JabRef#11491)

# Conflicts:
#	src/main/java/org/jabref/gui/openoffice/OOBibBase.java
#	src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
#	src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
#	src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
Comment thread src/main/java/org/jabref/preferences/JabRefPreferences.java Outdated
Comment thread src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java Outdated
import org.jabref.logic.openoffice.action.Update;
import org.jabref.logic.openoffice.oocsltext.CSLCitationOOAdapter;
import org.jabref.logic.openoffice.style.OOBibStyle;
import org.jabref.logic.openoffice.style.CSLStyle;

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🚫 [checkstyle] <com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck> reported by reviewdog 🐶
Unused import - org.jabref.logic.openoffice.style.CSLStyle.

Comment thread src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
Comment thread src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java Outdated
Comment thread src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java Outdated
Comment thread src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java Outdated
Comment thread src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java Outdated
@subhramit subhramit changed the title Change OO Style Architecture Persist OO Style choice (& Change OO Style Architecture) Jul 20, 2024
@subhramit subhramit closed this Jul 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants