Small refactoring in Importer package #2053
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tobiasdiez
added
status: ready-for-review
Siedlerchr
reviewed
Sep 24, 2016
| @@ -79,21 +78,19 @@ public ImportCustomizationDialog(final JabRefFrame frame) { | |||
|
|
|||
| JButton addFromFolderButton = new JButton(Localization.lang("Add from folder")); | |||
| addFromFolderButton.addActionListener(e -> { | |||
| CustomImporter importer = new CustomImporter(); | |||
|
|
|||
| FileDialog dialog = new FileDialog(frame).withExtension(FileExtensions.CLASS); | |||
| dialog.setDefaultExtension(FileExtensions.CLASS); | |||
| Optional<Path> selectedFile = dialog.showDialogAndGetSelectedFile(); | |||
|
|
|||
| if (selectedFile.isPresent() && (selectedFile.get().getParent() != null)) { | |||
There was a problem hiding this comment.
I think there it would actually make sense to use ifPresent or is there somehow a possible exception thrown?
| String className = null; | ||
| File actualPath = path; | ||
| // remove leading basepath from path | ||
| while (!actualPath.equals(basePath)) { | ||
| while (!actualPath.equals(new File(basePath))) { |
There was a problem hiding this comment.
Can this somehow be replaced with nio methods?
| .replace("/", "."); | ||
| importer.setClassName(className); | ||
| String className = tempZipEntry.getName().substring(0, tempZipEntry.getName().lastIndexOf('.')).replace( | ||
| "/", "."); |
There was a problem hiding this comment.
Looks really weird. Maybe can be replaced with sth from the nio paths
|
I am not sure if I like that Custom Imports have to be changed as this is again breaking functionality for existing importers |
|
You have some check style errors... |
tobiasdiez
force-pushed
the
importerRefact
branch
from
8cd7d3f
to
e47e002
Compare
|
I decided against changing the Will merge this now... you had enough time to protest 😆 |
Siedlerchr
added a commit
that referenced
this pull request
Oct 9, 2016
* upstream/master: (102 commits) Removed unused test code (#2140) Fix main table bug when creating a duplicate (#2135) Remove explicit author and add SPDX-License-Identifier Remove GPL from README.md and CONTRIBUTING.md fix preview update (#2125) Remove some UnicodeToLatex uses (#2132) Fix mixup in french/farsi localization FetcherException should extend JabRefException Fix exception when opening preference dialog (#2127) Unify ParserException and ParseException (#2124) Small refactoring in Importer package (#2053) Implement Datepicker "none"-button (#2122) revert change from 816d30c Change title/tooltip of source panel in biblatex mode (#2120) Refactoring: completey typed metadata and add detailed travis output (#2112) RTFchars fix (#2097) Fix NPE in Medline fetcher on missing ISSN (#2113) Ctrl-s parsing error message (#2114) Fix bad web search error messages (#2034) parse error freeze (#2106) ... # Conflicts: # src/main/java/net/sf/jabref/collab/FileUpdateMonitor.java # src/main/java/net/sf/jabref/gui/externalfiles/DownloadExternalFile.java # src/main/java/net/sf/jabref/gui/externalfiles/DroppedFileHandler.java # src/main/java/net/sf/jabref/gui/externalfiles/MoveFileAction.java # src/main/java/net/sf/jabref/logic/cleanup/RenamePdfCleanup.java # src/main/java/net/sf/jabref/logic/exporter/FileSaveSession.java # src/main/java/net/sf/jabref/logic/util/io/FileUtil.java # src/main/java/net/sf/jabref/preferences/JabRefPreferences.java
zesaro
pushed a commit
to zesaro/jabref
that referenced
this pull request
Nov 22, 2016
* Remove unused methods and mark some methods as deprecated in importformatpreferences * Rename importformat to importer * Move importer up in package * Rename getFormatName -> getName * Rewrite CustomImporter * Optimize imports * Add changelog entry * Change localizaiton
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Localization tests fail due to rename, will fix this before merge)