Skip to content

Update Eclipse style to intellij style#3827

Merged
Siedlerchr merged 4 commits into
maintable-betafrom
eclipsestyle
Mar 14, 2018
Merged

Update Eclipse style to intellij style#3827
Siedlerchr merged 4 commits into
maintable-betafrom
eclipsestyle

Conversation

@Siedlerchr

@Siedlerchr Siedlerchr commented Mar 9, 2018

Copy link
Copy Markdown
Member

Fixes #3815
Screenshots of indentation in #3815

(cherry pick to master afterwards)


  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

@Siedlerchr Siedlerchr added dev: build-system status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers labels Mar 9, 2018

@koppor koppor left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Cannot judge the Eclipse changes, but you are the eclipse user/export, so you should know best.

Comment thread config/README.md Outdated

# Eclipse:

In case the Eclipse style needs to be adjusted for the eclipse.gradle file:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't understand that. Maybe, the gradle script needs to be rewritten to inject an exported XML file`?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I think I just found a simpler way. I will update the doc accordingly

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I generally found a nice and simple way. One can directly export the file in eclipse as EPF file in properties format
The main drawback is that it's not possible to import it with gradle (argh!).
So therefore the only solution would be to read the file, remove all unnecessary lines and write that into the .prefs file (ideally once). Then we can just copy over the prefs file to the workspace.

@tobiasdiez tobiasdiez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I also cannot test these changes, but trust you in this.

@@ -0,0 +1,328 @@
#Fri Mar 09 22:05:27 CET 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this file needed?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes, as a reference file. And this file can still be imported manually.
Mabye someone more experienced in gradle/scripting can create a simple script to copy the things from that file to the workspace org.eclipse.jdt.ui.prefs file

@koppor

koppor commented Mar 10, 2018 via email

Copy link
Copy Markdown
Member

@Siedlerchr

Copy link
Copy Markdown
Member Author

I merge this for the moment. As we don't change our code style that often we can postpone the automatic creation of the prefs

@Siedlerchr Siedlerchr merged commit 4994d7f into maintable-beta Mar 14, 2018
@Siedlerchr Siedlerchr deleted the eclipsestyle branch March 14, 2018 16:37
Siedlerchr added a commit that referenced this pull request Mar 14, 2018
…drop

* upstream/maintable-beta: (97 commits)
  Update Eclipse style to intellij style (#3827)
  fix some not on fx thread dialogs in preferences
  fix inital save error Convert last dialog to javafx refactor exception
  Merge changes for renamed actions
  New Crowdin translations (#3835)
  Partial revert of #3715 since double click on group should expand/collapse it (#3834)
  Add Spanish translations (#3833)
  update applicationsinsights
  update javafxsvg to 1.3.0
  Disable FTP Download on CI
  Apply copy linked files dialog fix from master
  Show dialog when copy files did not found file (#3826)
  Remove customjfx (#3779)
  Disable FTP Download on CI
  Remove color customization for maintable from preferences (#3808)
  Remove erroneous escape character (#3831)
  New translations JabRef_en.properties (French)
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Italian)
  New translations JabRef_en.properties (Indonesian)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/maintable/MainTable.java
Siedlerchr added a commit that referenced this pull request Mar 17, 2018
…esDlg

* upstream/maintable-beta: (346 commits)
  add missing localization
  fix keybinding of entry editor add missing keybinding of search
  Update java-string-similarity from 1.0.1 -> 1.1.0
  Update log4j from 2.10.0 -> 2.11.0
  Update guava from 24.0 -> 24.1
  New Crowdin translations (#3853)
  Fetcher refactorings
  Fix ScienceDirect fetcher #3854
  Fix Google Scholar fetcher test
  Fix DBLP fetcher tests
  Move migration to top level package
  New Crowdin translations (#3851)
  Update Eclipse style to intellij style (#3827)
  fix some not on fx thread dialogs in preferences
  fix inital save error Convert last dialog to javafx refactor exception
  Update mysql-connector from 5.1.45 -> 5.1.46
  Update mockito-core from 2.15.0 -> 2.16.0
  New translations JabRef_en.properties (Spanish)
  New translations Menu_en.properties (Spanish)
  Merge changes for renamed actions
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dev: build-system status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants